dhb52
							
						 
					 | 
					
						
						
							
						
						a0b413b3a3
					 | 
					
						
						
							
							refactor: CRM/数据统计/排行榜 重命名
						
						
						
						
						
						
					 | 
					
						2024-02-28 21:41:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						7d120a2f36
					 | 
					
						
						
							
							feat: CRM/数据统计/客户总量分析
						
						
						
						
						
						
					 | 
					
						2024-02-28 21:41:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b285548b9d
					 | 
					
						
						
							
							!882 fix: 兼容有些21jdk getFirst 会找不到符合的错误
						
						
						
						
						
						
						
						Merge pull request !882 from e7c_corp/N/A 
						
						
					 | 
					
						2024-02-26 15:08:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								e7c_corp
							
						 
					 | 
					
						
						
							
						
						a6e13da602
					 | 
					
						
						
							
							fix: 兼容有些21jdk getFirst 会找不到符合的错误
						
						
						
						
						
						
						
						兼容有些21jdk getFirst 会找不到符合的错误 
						
						
					 | 
					
						2024-02-26 15:00:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cb8d4e0976
					 | 
					
						
						
							
							✨ CRM:增加回款的待办事项逻辑
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:24:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a531ba2902
					 | 
					
						
						
							
							✨ CRM:增加回款超过合同的退款金额校验
						
						
						
						
						
						
					 | 
					
						2024-02-26 09:27:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5fbb423621
					 | 
					
						
						
							
							✨ CRM:完善合同的待回款金额
						
						
						
						
						
						
					 | 
					
						2024-02-25 20:50:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						33b056e6c4
					 | 
					
						
						
							
							✨ CRM:完善回款的审批
						
						
						
						
						
						
					 | 
					
						2024-02-25 20:01:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2890de8103
					 | 
					
						
						
							
							✨ CRM:完善回款的新增/修改
						
						
						
						
						
						
					 | 
					
						2024-02-25 18:44:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						332eb30b6c
					 | 
					
						
						
							
							✨ CRM:完善回款列表
						
						
						
						
						
						
					 | 
					
						2024-02-25 16:52:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						91c179029f
					 | 
					
						
						
							
							✨ CRM:完善回款 plan 新增/修改
						
						
						
						
						
						
					 | 
					
						2024-02-25 16:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ba47402a7f
					 | 
					
						
						
							
							✨ CRM:完善回款 plan 列表
						
						
						
						
						
						
					 | 
					
						2024-02-25 09:23:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						85c9524a2d
					 | 
					
						
						
							
							!880 CRM: 完善回款
						
						
						
						
						
						
						
						Merge pull request !880 from puhui999/develop 
						
						
					 | 
					
						2024-02-25 00:15:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e5c3e69f5c
					 | 
					
						
						
							
							CRM: 完善回款
						
						
						
						
						
						
					 | 
					
						2024-02-25 02:11:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b9ffb7833c
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-02-25 00:39:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						88cb683752
					 | 
					
						
						
							
							CRM: 完善回款
						
						
						
						
						
						
					 | 
					
						2024-02-25 00:36:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c726cd3aff
					 | 
					
						
						
							
							✨ CRM:将 bi 调整成 statistics
						
						
						
						
						
						
					 | 
					
						2024-02-24 22:26:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cd87f2e4aa
					 | 
					
						
						
							
							✨ CRM:code review 客户导出的实现
						
						
						
						
						
						
					 | 
					
						2024-02-24 19:57:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e7bd2a568d
					 | 
					
						
						
							
							✨ CRM:增加商机关联联系人
						
						
						
						
						
						
					 | 
					
						2024-02-24 19:35:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						53ebd39c73
					 | 
					
						
						
							
							✨ CRM:待办事项(接入合同)
						
						
						
						
						
						
					 | 
					
						2024-02-24 17:55:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0b0830f445
					 | 
					
						
						
							
							✨ CRM:增加合同配置表
						
						
						
						
						
						
					 | 
					
						2024-02-24 16:51:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						616ae8eaeb
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-02-24 16:08:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b6098cff83
					 | 
					
						
						
							
							✨ CRM:商机接入合同列表
						
						
						
						
						
						
					 | 
					
						2024-02-24 16:08:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						29f1eb2c18
					 | 
					
						
						
							
							✨ CRM:优化 CRM 跟进记录的实现
						
						
						
						
						
						
					 | 
					
						2024-02-24 15:46:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						67b091620d
					 | 
					
						
						
							
							!879 完善 Excel 导入模版下拉选择生成实现
						
						
						
						
						
						
						
						Merge pull request !879 from puhui999/develop 
						
						
					 | 
					
						2024-02-24 04:58:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 
						
						
					 | 
					
						2024-02-24 11:44:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5dc1dbb3b2
					 | 
					
						
						
							
							完善 Excel 导入模版下拉选择生成实现
						
						
						
						
						
						
					 | 
					
						2024-02-24 11:40:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3f8fa6b1bc
					 | 
					
						
						
							
							✨ CRM:简化 CRM 数据权限的实现
						
						
						
						
						
						
					 | 
					
						2024-02-24 11:14:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a8f6a3d324
					 | 
					
						
						
							
							✨ CRM:完善 CRM 相关实现
						
						
						
						
						
						
					 | 
					
						2024-02-24 08:18:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e53a0ca884
					 | 
					
						
						
							
							✨ CRM:code review 客户导入
						
						
						
						
						
						
					 | 
					
						2024-02-23 18:50:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a64da48aa3
					 | 
					
						
						
							
							!876 CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
						
						
						
						
						
						
						
						Merge pull request !876 from puhui999/develop 
						
						
					 | 
					
						2024-02-23 07:01:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						be2431b73b
					 | 
					
						
						
							
							CRM: 完善回款审批逻辑
						
						
						
						
						
						
					 | 
					
						2024-02-23 14:37:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 
						
						
					 | 
					
						2024-02-23 14:16:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4066ad3e1a
					 | 
					
						
						
							
							✨ CRM:完善合同的审批逻辑
						
						
						
						
						
						
					 | 
					
						2024-02-23 12:59:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5892c8897f
					 | 
					
						
						
							
							CRM: 流程状态转换封装
						
						
						
						
						
						
					 | 
					
						2024-02-23 12:20:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 
						
						
					 | 
					
						2024-02-23 12:16:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c6b133d919
					 | 
					
						
						
							
							CRM: 完善回款
						
						
						
						
						
						
					 | 
					
						2024-02-23 12:14:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b3cfad9396
					 | 
					
						
						
							
							CRM: 完善回款计划
						
						
						
						
						
						
					 | 
					
						2024-02-23 10:42:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d604e76d16
					 | 
					
						
						
							
							✨ CRM:完善合同的跟进记录实现
						
						
						
						
						
						
					 | 
					
						2024-02-23 09:31:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b0def8b586
					 | 
					
						
						
							
							✨ CRM:完善合同的新增、修改实现
						
						
						
						
						
						
					 | 
					
						2024-02-23 00:04:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ef26b5e8dc
					 | 
					
						
						
							
							✨ CRM:完善合同的列表实现
						
						
						
						
						
						
					 | 
					
						2024-02-22 21:54:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						872fe53585
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-02-22 21:26:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c97c9f882e
					 | 
					
						
						
							
							✨ CRM:完成商机状态的变更
						
						
						
						
						
						
					 | 
					
						2024-02-22 20:41:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0f2d974e9c
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-02-22 11:08:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						41b8575b8d
					 | 
					
						
						
							
							CRM:完善客户导入
						
						
						
						
						
						
					 | 
					
						2024-02-22 11:07:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						740e9297fa
					 | 
					
						
						
							
							✨ CRM:完善商机和联系人之间的关联
						
						
						
						
						
						
					 | 
					
						2024-02-22 09:35:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b26eb6266f
					 | 
					
						
						
							
							CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
						
						
						
						
						
						
					 | 
					
						2024-02-22 00:58:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d9b0c9b4cf
					 | 
					
						
						
							
							✨ CRM:完善商机的跟进记录
						
						
						
						
						
						
					 | 
					
						2024-02-21 23:37:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						df2441def9
					 | 
					
						
						
							
							!875 完善 review 提到的问题
						
						
						
						
						
						
						
						Merge pull request !875 from puhui999/develop 
						
						
					 | 
					
						2024-02-21 14:57:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1ad5602a19
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java 
						
						
					 | 
					
						2024-02-21 22:42:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |