6338 Commits (02466aca2e0a9a37b3bdc09deeeea4f69251a641)
 

Author SHA1 Message Date
YunaiV 02466aca2e 2.0.1 版本发布准备 2 years ago
YunaiV 0c600a7358 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 31e8777a7b CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2 years ago
YunaiV 656c3a77ec Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/event/BpmProcessInstanceResultEvent.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/listener/BpmServiceResultListener.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/CrmBacklogController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueTranslateReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanUpdateReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableUpdateReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessStatusTypeServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/bo/CrmBusinessUpdateProductReqBO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractResultListener.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/followup/bo/CrmUpdateFollowUpReqBO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/bo/CrmPermissionTransferReqBO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/customerlimitconfig/CrmCustomerLimitConfigServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
2 years ago
YunaiV a390fb4519 CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2 years ago
YunaiV 088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2 years ago
YunaiV cb8d4e0976 CRM:增加回款的待办事项逻辑 2 years ago
YunaiV a531ba2902 CRM:增加回款超过合同的退款金额校验 2 years ago
YunaiV 5fbb423621 CRM:完善合同的待回款金额 2 years ago
YunaiV 33b056e6c4 CRM:完善回款的审批 2 years ago
YunaiV 2890de8103 CRM:完善回款的新增/修改 2 years ago
YunaiV 332eb30b6c CRM:完善回款列表 2 years ago
YunaiV 91c179029f CRM:完善回款 plan 新增/修改 2 years ago
YunaiV ba47402a7f CRM:完善回款 plan 列表 2 years ago
芋道源码 85c9524a2d
!880 CRM: 完善回款
Merge pull request !880 from puhui999/develop
2 years ago
puhui999 e5c3e69f5c CRM: 完善回款 2 years ago
puhui999 b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop 2 years ago
puhui999 88cb683752 CRM: 完善回款 2 years ago
YunaiV c726cd3aff CRM:将 bi 调整成 statistics 2 years ago
YunaiV cd87f2e4aa CRM:code review 客户导出的实现 2 years ago
YunaiV e7bd2a568d CRM:增加商机关联联系人 2 years ago
YunaiV 53ebd39c73 CRM:待办事项(接入合同) 2 years ago
YunaiV 0b0830f445 CRM:增加合同配置表 2 years ago
YunaiV 616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2 years ago
YunaiV b6098cff83 CRM:商机接入合同列表 2 years ago
YunaiV 29f1eb2c18 CRM:优化 CRM 跟进记录的实现 2 years ago
芋道源码 67b091620d
!879 完善 Excel 导入模版下拉选择生成实现
Merge pull request !879 from puhui999/develop
2 years ago
puhui999 dd6981d901 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
2 years ago
puhui999 5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 2 years ago
YunaiV 3f8fa6b1bc CRM:简化 CRM 数据权限的实现 2 years ago
YunaiV a8f6a3d324 CRM:完善 CRM 相关实现 2 years ago
YunaiV e53a0ca884 CRM:code review 客户导入 2 years ago
芋道源码 a64da48aa3
!876 CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
Merge pull request !876 from puhui999/develop
2 years ago
puhui999 be2431b73b CRM: 完善回款审批逻辑 2 years ago
puhui999 eddd0a8801 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
2 years ago
YunaiV 4066ad3e1a CRM:完善合同的审批逻辑 2 years ago
puhui999 5892c8897f CRM: 流程状态转换封装 2 years ago
puhui999 0a97ff03c6 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
2 years ago
puhui999 c6b133d919 CRM: 完善回款 2 years ago
puhui999 b3cfad9396 CRM: 完善回款计划 2 years ago
YunaiV d604e76d16 CRM:完善合同的跟进记录实现 2 years ago
YunaiV b0def8b586 CRM:完善合同的新增、修改实现 2 years ago
YunaiV ef26b5e8dc CRM:完善合同的列表实现 2 years ago
puhui999 872fe53585 Merge remote-tracking branch 'yudao/develop' into develop 2 years ago
YunaiV c97c9f882e CRM:完成商机状态的变更 2 years ago
puhui999 0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop 2 years ago
puhui999 41b8575b8d CRM:完善客户导入 2 years ago
YunaiV 740e9297fa CRM:完善商机和联系人之间的关联 2 years ago
puhui999 b26eb6266f CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 2 years ago
YunaiV d9b0c9b4cf CRM:完善商机的跟进记录 2 years ago