puhui999
							
						 
					 | 
					
						
						
							
						
						1a96fb2ffc
					 | 
					
						
						
							
							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-01 14:17:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5f827b59f
					 | 
					
						
						
							
							📖 CRM:code review 合同流程
						
						
						
						
						
						
					 | 
					
						2024-02-01 09:46:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						624b35988e
					 | 
					
						
						
							
							BPM: 实现业务流程结果监听器
						
						
						
						
						
						
					 | 
					
						2024-02-01 00:45:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								安浩浩
							
						 
					 | 
					
						
						
							
						
						46e01e07a8
					 | 
					
						
						
							
							修改:CRM 商业智能,合并模块到 crm,优化查询
						
						
						
						
						
						
					 | 
					
						2024-01-31 23:35:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						acb8d3f23b
					 | 
					
						
						
							
							!858 CRM-客户: 完善客户导入
						
						
						
						
						
						
						
						Merge pull request !858 from puhui999/develop 
						
						
					 | 
					
						2024-01-30 04:41:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6f95f37117
					 | 
					
						
						
							
							📖 CRM:code review 待进入公海的客户
						
						
						
						
						
						
					 | 
					
						2024-01-30 12:40:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						cd28128e42
					 | 
					
						
						
							
							!859 feat: CRM-backlog-待进入公海的客户
						
						
						
						
						
						
						
						Merge pull request !859 from dhb52/crm-msg 
						
						
					 | 
					
						2024-01-30 04:14:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						52a68e1838
					 | 
					
						
						
							
							📖 CRM:code review 合同金额排行榜、回款金额排行榜
						
						
						
						
						
						
					 | 
					
						2024-01-30 09:24:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anhaohao
							
						 
					 | 
					
						
						
							
						
						bfed37af6f
					 | 
					
						
						
							
							修改:CRM 商业智能,回款金额排行榜时间字段 bug
						
						
						
						
						
						
					 | 
					
						2024-01-28 21:47:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4418a7bebc
					 | 
					
						
						
							
							CRM-合同:完善新增合同插入关联的商品
						
						
						
						
						
						
					 | 
					
						2024-01-28 20:15:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anhaohao
							
						 
					 | 
					
						
						
							
						
						fdd5d55fc8
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-01-28 20:11:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anhaohao
							
						 
					 | 
					
						
						
							
						
						65d7f8c4ab
					 | 
					
						
						
							
							新增:CRM 商业智能,合同金额排行榜和回款金额排行榜
						
						
						
						
						
						
					 | 
					
						2024-01-28 20:06:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ea6752f15e
					 | 
					
						
						
							
							BPM: 新增通过流程标识获取流程图
						
						
						
						
						
						
					 | 
					
						2024-01-28 16:34:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1cab3c009c
					 | 
					
						
						
							
							CRM-合同:新增发起合同审批
						
						
						
						
						
						
					 | 
					
						2024-01-28 01:50:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						5d8ca19b17
					 | 
					
						
						
							
							feat: CRM-backlog-待进入公海的客户
						
						
						
						
						
						
					 | 
					
						2024-01-28 00:22:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ebd9222764
					 | 
					
						
						
							
							✨ ERP:初始化模块,立个 2024 年的 flag
						
						
						
						
						
						
					 | 
					
						2024-01-27 17:25:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a877bb4731
					 | 
					
						
						
							
							CRM-客户: 完善客户导入
						
						
						
						
						
						
					 | 
					
						2024-01-27 15:15:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4605e93105
					 | 
					
						
						
							
							CRM-客户: 完善客户导入
						
						
						
						
						
						
					 | 
					
						2024-01-27 14:30:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d8b2da8eed
					 | 
					
						
						
							
							CRM-客户: 完善 TODO
						
						
						
						
						
						
					 | 
					
						2024-01-27 13:34:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d492daced4
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-27 00:55:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						6a6f669c7f
					 | 
					
						
						
							
							!854 CRM:【线索】
						
						
						
						
						
						
						
						Merge pull request !854 from Minh-X/develop 
						
						
					 | 
					
						2024-01-26 15:46:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						814b6f688d
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-26 23:46:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Minh-X
							
						 
					 | 
					
						
						
							
						
						11ce24ad1e
					 | 
					
						
						
							
							修改CrmClueRespVO字段描述
						
						
						
						
						
						
						
						Signed-off-by: Minh-X <bluesfish@yeah.net> 
						
						
					 | 
					
						2024-01-25 14:17:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								min
							
						 
					 | 
					
						
						
							
						
						ce397d4fbd
					 | 
					
						
						
							
							CRM:【线索】增加字段
						
						
						
						
						
						
					 | 
					
						2024-01-24 00:27:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ed92bf45ce
					 | 
					
						
						
							
							CRM: 客户自动掉入公海
						
						
						
						
						
						
					 | 
					
						2024-01-23 23:30:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6850c7c71d
					 | 
					
						
						
							
							CRM: 完善跟进日志 TODO
						
						
						
						
						
						
					 | 
					
						2024-01-23 22:31:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a86bce6f8b
					 | 
					
						
						
							
							📖 CRM:code review 商机模块
						
						
						
						
						
						
					 | 
					
						2024-01-23 09:35:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						655fc03394
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-01-23 09:24:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						14d2195c6d
					 | 
					
						
						
							
							!850 商机模块代码优化
						
						
						
						
						
						
						
						Merge pull request !850 from lzxhqs/develop 
						
						
					 | 
					
						2024-01-23 01:23:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d732008ef8
					 | 
					
						
						
							
							📖 CRM:code review 跟进日志
						
						
						
						
						
						
					 | 
					
						2024-01-23 09:22:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						86a177226d
					 | 
					
						
						
							
							FIX: 修复启动报错
						
						
						
						
						
						
					 | 
					
						2024-01-22 23:23:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ca9f3c522d
					 | 
					
						
						
							
							CRM-线索:完善操作日志
						
						
						
						
						
						
					 | 
					
						2024-01-22 22:46:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						8675d13548
					 | 
					
						
						
							
							CRM-线索:完善线索转客户
						
						
						
						
						
						
					 | 
					
						2024-01-22 22:23:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f7d41186e4
					 | 
					
						
						
							
							CRM: 获取模块操作日志接口抽离
						
						
						
						
						
						
					 | 
					
						2024-01-22 20:30:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lzxhqs
							
						 
					 | 
					
						
						
							
						
						fb54c5fc89
					 | 
					
						
						
							
							商机模块代码优化
						
						
						
						
						
						
					 | 
					
						2024-01-22 16:48:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						206899bfc0
					 | 
					
						
						
							
							📖 CRM:code review 待办事项
						
						
						
						
						
						
					 | 
					
						2024-01-22 12:23:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						422b19caf7
					 | 
					
						
						
							
							!847 fix: 根据Code Review修改代办消息backlog
						
						
						
						
						
						
						
						Merge pull request !847 from dhb52/crm-msg 
						
						
					 | 
					
						2024-01-22 04:14:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						23ef3c8ae0
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-22 08:53:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						227a4f126a
					 | 
					
						
						
							
							CRM: 完善跟进 TODO
						
						
						
						
						
						
					 | 
					
						2024-01-20 23:07:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f366d440d8
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-01-20 22:50:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d293fdd474
					 | 
					
						
						
							
							fix: 修复 CRM 的一些 bug
						
						
						
						
						
						
					 | 
					
						2024-01-20 22:49:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						231fd68435
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into crm-msg
						
						
						
						
						
						
					 | 
					
						2024-01-20 22:03:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c6c8dddfec
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-20 19:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						5b26d8fa00
					 | 
					
						
						
							
							!844 CRM: 完善跟进 TODO
						
						
						
						
						
						
						
						Merge pull request !844 from puhui999/develop 
						
						
					 | 
					
						2024-01-20 11:00:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						39ae547b9d
					 | 
					
						
						
							
							📖 CRM:code review 线索逻辑
						
						
						
						
						
						
					 | 
					
						2024-01-20 18:55:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						8920b9787d
					 | 
					
						
						
							
							fix: CRM selectBatchIds 权限查询 ids 筛选不生效的 bug
						
						
						
						
						
						
					 | 
					
						2024-01-20 18:42:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								min
							
						 
					 | 
					
						
						
							
						
						604611e1d2
					 | 
					
						
						
							
							CRM:【线索】补充相关日志
						
						
						
						
						
						
					 | 
					
						2024-01-20 15:38:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								min
							
						 
					 | 
					
						
						
							
						
						4ce9271ece
					 | 
					
						
						
							
							CRM:【线索】创建、删除线索时同时创建、删除数据权限
						
						
						
						
						
						
					 | 
					
						2024-01-20 15:08:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7914423c66
					 | 
					
						
						
							
							CRM: 完善跟进 TODO
						
						
						
						
						
						
					 | 
					
						2024-01-20 14:56:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								min
							
						 
					 | 
					
						
						
							
						
						ba4f9207e2
					 | 
					
						
						
							
							CRM:【线索】使用工具类替换stream操作
						
						
						
						
						
						
					 | 
					
						2024-01-20 13:55:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |