YunaiV
							
						 
					 | 
					
						
						
							
						
						0fba56cda8
					 | 
					
						
						
							
							📖 CRM:code review 合同逻辑
						
						
						
						
						
						
					 | 
					
						2024-02-17 19:14:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c6041da3c4
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java 
						
						
					 | 
					
						2024-02-17 18:17:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c40ea1eaa6
					 | 
					
						
						
							
							📖 CRM:code review 商业智能的排行版
						
						
						
						
						
						
					 | 
					
						2024-02-17 18:14:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						bba32c6ba3
					 | 
					
						
						
							
							!866 新增:CRM 商业智能,其他排名接口
						
						
						
						
						
						
						
						Merge pull request !866 from 安浩浩/develop 
						
						
					 | 
					
						2024-02-17 10:06:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5955f39e24
					 | 
					
						
						
							
							📖 CRM:code review 待办项目的实现
						
						
						
						
						
						
					 | 
					
						2024-02-17 18:02:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9caaa96e5b
					 | 
					
						
						
							
							CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
						
						
						
						
						
						
					 | 
					
						2024-02-08 11:53:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						3b612b2e6d
					 | 
					
						
						
							
							feat: 待回款提醒,即将到期的合同,待审核回款
						
						
						
						
						
						
					 | 
					
						2024-02-07 23:53:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						6fc8c4809f
					 | 
					
						
						
							
							feat: 合同[审批状态]条件筛选
						
						
						
						
						
						
					 | 
					
						2024-02-06 22:58:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						84f3b230d2
					 | 
					
						
						
							
							CRM-合同: 新增合同关联商品
						
						
						
						
						
						
					 | 
					
						2024-02-05 00:14:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								安浩浩
							
						 
					 | 
					
						
						
							
						
						3213cad317
					 | 
					
						
						
							
							新增:CRM 商业智能,其他排名接口
						
						
						
						
						
						
					 | 
					
						2024-02-04 23:54:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf8ec22144
					 | 
					
						
						
							
							📖 CRM:code review 合同的代码实现
						
						
						
						
						
						
					 | 
					
						2024-02-04 12:57:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3347d3320d
					 | 
					
						
						
							
							📖 CRM:code review 合同的代码实现
						
						
						
						
						
						
					 | 
					
						2024-02-04 09:41:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ba6218b835
					 | 
					
						
						
							
							CRM-合同: transfer
						
						
						
						
						
						
					 | 
					
						2024-02-03 22:13:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						59dfa10461
					 | 
					
						
						
							
							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/business/CrmBusinessServiceImpl.java 
						
						
					 | 
					
						2024-02-03 20:52:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						53badfc367
					 | 
					
						
						
							
							CRM-CONTRACT: 完善合同编辑回显
						
						
						
						
						
						
					 | 
					
						2024-02-03 20:49:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6a63f2f078
					 | 
					
						
						
							
							CRM-CONTRACT: 完善合同编辑回显
						
						
						
						
						
						
					 | 
					
						2024-02-03 14:08:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						59e6f23788
					 | 
					
						
						
							
							CRM-CONTRACT: 完善 TODO
						
						
						
						
						
						
					 | 
					
						2024-02-03 12:29:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e9a29e6dd4
					 | 
					
						
						
							
							CRM:优化合同金额排行、回款金额排行
						
						
						
						
						
						
					 | 
					
						2024-02-03 01:14:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1fd731a90a
					 | 
					
						
						
							
							!861 修改:CRM 商业智能,合并模块到 crm,优化查询
						
						
						
						
						
						
						
						Merge pull request !861 from 安浩浩/develop 
						
						
					 | 
					
						2024-02-02 01:29:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |