dhb52
							
						 
					 | 
					
						
						
							
						
						1944199f67
					 | 
					
						
						
							
							fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml
						
						
						
						
						
						
					 | 
					
						2024-04-02 23:44:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5faa006dd0
					 | 
					
						
						
							
							bugfix:修复拼团详情错误传递 groupon_id 的问题
						
						
						
						
						
						
					 | 
					
						2024-03-30 15:28:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f591a04317
					 | 
					
						
						
							
							CRM:code review【员工业绩】的实现
						
						
						
						
						
						
					 | 
					
						2024-03-30 14:39:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						08c851aeab
					 | 
					
						
						
							
							!916 CRM员工业绩统计PR v1.0
						
						
						
						
						
						
						
						Merge pull request !916 from scholarli/develop 
						
						
					 | 
					
						2024-03-30 06:25:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3f5724e978
					 | 
					
						
						
							
							CRM:code review【客户画像】的实现
						
						
						
						
						
						
					 | 
					
						2024-03-30 14:17:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						924580f4a2
					 | 
					
						
						
							
							CRM:重构【客户画像】,从【客户统计】拆分出去先~
						
						
						
						
						
						
					 | 
					
						2024-03-30 13:51:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3b379d8cc0
					 | 
					
						
						
							
							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/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java 
						
						
					 | 
					
						2024-03-30 11:54:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						94b724e30a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-03-28 19:05:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a80ba48889
					 | 
					
						
						
							
							bugfix:同步 master 修改的 bug
						
						
						
						
						
						
					 | 
					
						2024-03-28 19:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1cd5f47eb3
					 | 
					
						
						
							
							!926 【轻量级 PR】:fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE
						
						
						
						
						
						
						
						Merge pull request !926 from dhb52/N/A 
						
						
					 | 
					
						2024-03-28 11:01:43 +00: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						2ea56b51eb
					 | 
					
						
						
							
							【轻量级 PR】:fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE
						
						
						
						
						
						
						
						Signed-off-by: dhb52 <dhb52@126.com> 
						
						
					 | 
					
						2024-03-27 14:30:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ba541fba83
					 | 
					
						
						
							
							README:增加功能图,方便理解
						
						
						
						
						
						
					 | 
					
						2024-03-27 21:06:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ec1ce2f358
					 | 
					
						
						
							
							README:增加功能图,方便理解
						
						
						
						
						
						
					 | 
					
						2024-03-27 21:05:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						aea8fb7fc6
					 | 
					
						
						
							
							BPM:完善相关的代码注释
						
						
						
						
						
						
					 | 
					
						2024-03-27 19:49:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						62de6c36bc
					 | 
					
						
						
							
							BPM:完善相关的代码注释
						
						
						
						
						
						
					 | 
					
						2024-03-27 19:42:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3b8dee4963
					 | 
					
						
						
							
							BPM:完善相关的代码注释
						
						
						
						
						
						
					 | 
					
						2024-03-26 08:38:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						22191e81e3
					 | 
					
						
						
							
							CRM: 新增客户区域数据统计
						
						
						
						
						
						
					 | 
					
						2024-03-24 22:24:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ce013a2562
					 | 
					
						
						
							
							CRM: 新增客户行业、来源、级别统计数据统计
						
						
						
						
						
						
					 | 
					
						2024-03-24 17:15:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cc27652f86
					 | 
					
						
						
							
							最新菜单 SQL 的同步
						
						
						
						
						
						
					 | 
					
						2024-03-24 10:43:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						18f6bdd1c0
					 | 
					
						
						
							
							最新菜单 SQL 的同步
						
						
						
						
						
						
					 | 
					
						2024-03-24 10:41:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5c5bd0e5da
					 | 
					
						
						
							
							BPM:流程模型的 icon 维护
						
						
						
						
						
						
					 | 
					
						2024-03-24 10:08:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						727faac8d8
					 | 
					
						
						
							
							BPM:增加流程表达式的管理
						
						
						
						
						
						
					 | 
					
						2024-03-23 21:11:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6d44bf0d7a
					 | 
					
						
						
							
							BPM:增加任务监听器、执行监听器的管理
						
						
						
						
						
						
					 | 
					
						2024-03-23 19:23:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						889b9406b8
					 | 
					
						
						
							
							BPM:增加任务监听器、执行监听器的管理
						
						
						
						
						
						
					 | 
					
						2024-03-23 15:58:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						528a321f0a
					 | 
					
						
						
							
							BPM:增加「发起人自选」的任务审批人的分配策略
						
						
						
						
						
						
					 | 
					
						2024-03-23 00:54:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						acea73c991
					 | 
					
						
						
							
							BPM:新增【流程任务】菜单,用于全部流程实例的查询
						
						
						
						
						
						
					 | 
					
						2024-03-22 09:06:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ba4b3701bf
					 | 
					
						
						
							
							BPM:新增【流程实例】菜单,用于全部流程实例的查询
						
						
						
						
						
						
					 | 
					
						2024-03-22 08:26:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e5444c5d47
					 | 
					
						
						
							
							BPM:优化 convert 的逻辑
						
						
						
						
						
						
					 | 
					
						2024-03-20 21:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c104191821
					 | 
					
						
						
							
							BPM:增强 model 流程模型部署时,各种参数校验
						
						
						
						
						
						
					 | 
					
						2024-03-20 18:51:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						559bab571a
					 | 
					
						
						
							
							BPM:移除 flowable starter 模块,融合到 bpm 模块中
						
						
						
						
						
						
					 | 
					
						2024-03-20 13:14:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						29a0fbfc43
					 | 
					
						
						
							
							BPM:支持多表单,每个流程任务都可以绑定流程表单
						
						
						
						
						
						
					 | 
					
						2024-03-20 12:50:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ed83b912e4
					 | 
					
						
						
							
							BPM:新增流程分类表,替代现有的 bpm_category 数据字典
						
						
						
						
						
						
					 | 
					
						2024-03-19 19:49:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d5e28d4c57
					 | 
					
						
						
							
							BPM:简化 userGroup 的实现
						
						
						
						
						
						
					 | 
					
						2024-03-19 12:13:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8c32eb24ec
					 | 
					
						
						
							
							BPM:优化 task 加减签的实现
						
						
						
						
						
						
					 | 
					
						2024-03-19 01:31:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0a7f94dd5f
					 | 
					
						
						
							
							BPM:完善 task 在通过、不通过、取消等情况下的 reason 和 comment 逻辑
						
						
						
						
						
						
					 | 
					
						2024-03-18 22:43:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bc4427aca5
					 | 
					
						
						
							
							BPM:完善 task 转派的实现
						
						
						
						
						
						
					 | 
					
						2024-03-18 20:44:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b2b2b497b1
					 | 
					
						
						
							
							BPM:完善 task 委托的实现
						
						
						
						
						
						
					 | 
					
						2024-03-18 19:24:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c4688d887c
					 | 
					
						
						
							
							BPM:增加 task 的审批建议
						
						
						
						
						
						
					 | 
					
						2024-03-18 18:41:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ba502fc528
					 | 
					
						
						
							
							BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送
						
						
						
						
						
						
					 | 
					
						2024-03-17 22:14:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3fce482716
					 | 
					
						
						
							
							BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低
						
						
						
						
						
						
					 | 
					
						2024-03-17 17:24:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d40fa0f929
					 | 
					
						
						
							
							BPM:流程任务的 status 状态实现,使用 Flowable 的 variables 存储,移除 bpm_task_ext 表
						
						
						
						
						
						
					 | 
					
						2024-03-17 10:10:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7967a2a195
					 | 
					
						
						
							
							BPM:流程实例的 status 状态实现,使用 Flowable 的 variables 存储,移除 bpm_process_instance_ext 表
						
						
						
						
						
						
					 | 
					
						2024-03-16 16:43:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a1defeb48a
					 | 
					
						
						
							
							BPM:新增顺序会签、或签的能力
						
						
						
						
						
						
					 | 
					
						2024-03-15 21:08:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scholar
							
						 
					 | 
					
						
						
							
						
						705a3e53ca
					 | 
					
						
						
							
							CRM员工业绩统计PR v2.0
						
						
						
						
						
						
					 | 
					
						2024-03-15 12:09:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5f73adcbb
					 | 
					
						
						
							
							BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式
						
						
						
						
						
						
					 | 
					
						2024-03-15 00:19:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |