YunaiV
							
						 
					 | 
					
						
						
							
						
						8266fb8f94
					 | 
					
						
						
							
							CRM:完善【排行版】功能
						
						
						
						
						
						
					 | 
					
						2024-03-30 11:49:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a8bec19196
					 | 
					
						
						
							
							CRM:code review【客户统计】的代码实现
						
						
						
						
						
						
					 | 
					
						2024-03-30 11:00:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						90f82b157d
					 | 
					
						
						
							
							CRM:优化【客户统计】的代码实现
						
						
						
						
						
						
					 | 
					
						2024-03-30 09:22:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						eab9627253
					 | 
					
						
						
							
							!909 feat: [CRM-客户分析]增加[时间间隔]选项
						
						
						
						
						
						
						
						Merge pull request !909 from dhb52/develop 
						
						
					 | 
					
						2024-03-28 11:13:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a80ba48889
					 | 
					
						
						
							
							bugfix:同步 master 修改的 bug
						
						
						
						
						
						
					 | 
					
						2024-03-28 19:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						907f3a58ba
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql 
						
						
					 | 
					
						2024-03-28 18:53:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3b8dee4963
					 | 
					
						
						
							
							BPM:完善相关的代码注释
						
						
						
						
						
						
					 | 
					
						2024-03-26 08:38:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e5444c5d47
					 | 
					
						
						
							
							BPM:优化 convert 的逻辑
						
						
						
						
						
						
					 | 
					
						2024-03-20 21:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c4688d887c
					 | 
					
						
						
							
							BPM:增加 task 的审批建议
						
						
						
						
						
						
					 | 
					
						2024-03-18 18:41:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						03213e3254
					 | 
					
						
						
							
							fix: [CRM-客户分析]更新http-client脚本,增加intervalType请求参数
						
						
						
						
						
						
					 | 
					
						2024-03-10 14:30:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						4ac28603b8
					 | 
					
						
						
							
							feat: [CRM-客户分析]增加[时间间隔]选项
						
						
						
						
						
						
					 | 
					
						2024-03-10 10:30:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						ee2be79987
					 | 
					
						
						
							
							fix: [CRM-客户统计]根据Code-Review 修改代码
						
						
						
						
						
						
					 | 
					
						2024-03-09 22:51:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d556b29214
					 | 
					
						
						
							
							CRM:code review 权限的优化
						
						
						
						
						
						
					 | 
					
						2024-03-09 18:27:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						6b752b5cb4
					 | 
					
						
						
							
							!907 CRM: 根据 review 完善数据权限
						
						
						
						
						
						
						
						Merge pull request !907 from puhui999/develop 
						
						
					 | 
					
						2024-03-09 10:01:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						af5fbb6ff4
					 | 
					
						
						
							
							CRM: TransferReqVO bizId -> id、修复商机转移错误
						
						
						
						
						
						
					 | 
					
						2024-03-09 17:54:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						47a698868c
					 | 
					
						
						
							
							CRM: 根据 review 完善数据权限
						
						
						
						
						
						
					 | 
					
						2024-03-09 17:00:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8dcc12f215
					 | 
					
						
						
							
							CRM:code review 客户总量统计
						
						
						
						
						
						
					 | 
					
						2024-03-09 16:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						85817a2426
					 | 
					
						
						
							
							!902 fix: [CRM-客户统计]根据Code-Review 修改
						
						
						
						
						
						
						
						Merge pull request !902 from dhb52/develop 
						
						
					 | 
					
						2024-03-09 07:38:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0043d02d0a
					 | 
					
						
						
							
							fix:商机 api 文档生成不对的问题
						
						
						
						
						
						
					 | 
					
						2024-03-09 14:31:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						89fc83c419
					 | 
					
						
						
							
							CRM:code review 客户权限的实现
						
						
						
						
						
						
					 | 
					
						2024-03-09 11:58:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e2ec426a9f
					 | 
					
						
						
							
							!900 CRM:完善数据权限,实现数据权限同时添加、同时转移
						
						
						
						
						
						
						
						Merge pull request !900 from puhui999/develop 
						
						
					 | 
					
						2024-03-09 03:18:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						0386820a1c
					 | 
					
						
						
							
							feat: 增加[客户行业、客户来源]等字段显示,重构代码
						
						
						
						
						
						
					 | 
					
						2024-03-05 23:16:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						06c0d86544
					 | 
					
						
						
							
							fix: 使用convertSetByFlatMap避免 ID 重复
						
						
						
						
						
						
						
						Signed-off-by: dhb52 <dhb52@126.com> 
						
						
					 | 
					
						2024-03-05 15:08:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						a23ea45632
					 | 
					
						
						
							
							fix: [CRM-客户统计]根据Code-Review 修改
						
						
						
						
						
						
					 | 
					
						2024-03-04 23:51:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ba1b028001
					 | 
					
						
						
							
							CRM:完善数据权限,实现数据权限同时添加、同时转移
						
						
						
						
						
						
					 | 
					
						2024-03-03 20:10:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f56fab932a
					 | 
					
						
						
							
							CRM:完善 excel 导出 review 提到的问题
						
						
						
						
						
						
					 | 
					
						2024-03-02 23:24:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f35ef59d1
					 | 
					
						
						
							
							CRM:code review excel 导出的重构
						
						
						
						
						
						
					 | 
					
						2024-03-02 00:25:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc7734319b
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	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/service/receivable/CrmReceivableServiceImpl.java 
						
						
					 | 
					
						2024-03-01 23:46:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						379bd95840
					 | 
					
						
						
							
							CRM:code review 客户分析(客户总量分析)
						
						
						
						
						
						
					 | 
					
						2024-03-01 23:37:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2bf5c7a701
					 | 
					
						
						
							
							!889 feat: CRM/数据统计/员工客户分析 初稿
						
						
						
						
						
						
						
						Merge pull request !889 from dhb52/develop 
						
						
					 | 
					
						2024-03-01 14:21:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dda0909843
					 | 
					
						
						
							
							🎉 2.0.1 版本发布!
						
						
						
						
						
						
					 | 
					
						2024-03-01 20:01:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhanhong
							
						 
					 | 
					
						
						
							
						
						814acb83ae
					 | 
					
						
						
							
							fix:跟进记录分页不显示商机
						
						
						
						
						
						
					 | 
					
						2024-03-01 09:28:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8ff710e49d
					 | 
					
						
						
							
							✨ 同步 master 的一些 pr 代码变更
						
						
						
						
						
						
					 | 
					
						2024-03-01 09:00:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						34f68ce4c6
					 | 
					
						
						
							
							feat: CRM/数据统计/员工客户分析 初稿
						
						
						
						
						
						
					 | 
					
						2024-03-01 00:10:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						fbb624d826
					 | 
					
						
						
							
							feat: CRM/数据统计/员工客户分析/客户跟进次数分析
						
						
						
						
						
						
					 | 
					
						2024-02-28 23:07:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8b6bc7c54e
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-02-28 23:04:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b135314482
					 | 
					
						
						
							
							!890 修复:CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
						
						
						
						
						
						
						
						Merge pull request !890 from 李占宏/develop 
						
						
					 | 
					
						2024-02-28 14:56:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f4889c68e
					 | 
					
						
						
							
							✨ 全局:将 dict 组件,融合到 excel 组件里,减少 starter
						
						
						
						
						
						
					 | 
					
						2024-02-28 21:42:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						a0b413b3a3
					 | 
					
						
						
							
							refactor: CRM/数据统计/排行榜 重命名
						
						
						
						
						
						
					 | 
					
						2024-02-28 21:41:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						7d120a2f36
					 | 
					
						
						
							
							feat: CRM/数据统计/客户总量分析
						
						
						
						
						
						
					 | 
					
						2024-02-28 21:41:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						720b54c353
					 | 
					
						
						
							
							CRM: 完善回款操作日志
						
						
						
						
						
						
					 | 
					
						2024-02-28 11:25:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhanhong
							
						 
					 | 
					
						
						
							
						
						b94cd08772
					 | 
					
						
						
							
							修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭");
						
						
						
						
						
						
					 | 
					
						2024-02-28 00:07:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhanhong
							
						 
					 | 
					
						
						
							
						
						89aca4572d
					 | 
					
						
						
							
							修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错
						
						
						
						
						
						
					 | 
					
						2024-02-28 00:00:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhanhong
							
						 
					 | 
					
						
						
							
						
						8222c3a831
					 | 
					
						
						
							
							修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId
						
						
						
						
						
						
					 | 
					
						2024-02-27 23:51:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c4ff0a1038
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-02-27 21:28:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d134bfc4a6
					 | 
					
						
						
							
							✨ 进一步同步 boot 和 cloud 代码,移除多余无用的类
						
						
						
						
						
						
					 | 
					
						2024-02-27 17:15:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2aade25e78
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
						
						
						
						
						
						
					 | 
					
						2024-02-26 23:18:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								e7c_corp
							
						 
					 | 
					
						
						
							
						
						a6e13da602
					 | 
					
						
						
							
							fix: 兼容有些21jdk getFirst 会找不到符合的错误
						
						
						
						
						
						
						
						兼容有些21jdk getFirst 会找不到符合的错误 
						
						
					 | 
					
						2024-02-26 15:00:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a390fb4519
					 | 
					
						
						
							
							✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:55:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						088fbb2096
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
						
						
						
						
						
						
					 | 
					
						2024-02-26 12:25:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |