puhui999
							
						 
					 | 
					
						
						
							
						
						4a39595576
					 | 
					
						
						
							
							MALL-KEFU: 优化管理员会话处理逻辑
						
						
						
						
						
						
					 | 
					
						2024-07-05 17:59:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						19e7763440
					 | 
					
						
						
							
							MALL-KEFU: 优化消息已读处理逻辑
						
						
						
						
						
						
					 | 
					
						2024-07-05 16:30:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b7e4f8e460
					 | 
					
						
						
							
							【代码评审】MALL:review 客服的实现
						
						
						
						
						
						
					 | 
					
						2024-07-02 20:59:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						80a1f50cc8
					 | 
					
						
						
							
							!1001 MALL-KEFU: 完善管理端接口
						
						
						
						
						
						
						
						Merge pull request !1001 from puhui999/develop 
						
						
					 | 
					
						2024-07-02 12:53:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						60c473a312
					 | 
					
						
						
							
							MALL-KEFU: 管理端发送消息增加消息类型
						
						
						
						
						
						
					 | 
					
						2024-07-02 17:11:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						eed4cf127e
					 | 
					
						
						
							
							MALL-KEFU: 完善管理端接口
						
						
						
						
						
						
					 | 
					
						2024-07-01 17:20:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4ce2be724e
					 | 
					
						
						
							
							MALL-KEFU: 根据 review 完善客服相关实现
						
						
						
						
						
						
					 | 
					
						2024-06-24 15:45:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						866b38535e
					 | 
					
						
						
							
							【代码评审】MALL:review 客服的实现
						
						
						
						
						
						
					 | 
					
						2024-06-17 19:41:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9c4afeb7ba
					 | 
					
						
						
							
							!993 MALL-KEFU: 根据代码评审完善相关方法
						
						
						
						
						
						
						
						Merge pull request !993 from puhui999/develop 
						
						
					 | 
					
						2024-06-17 11:16:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						cdb20539ea
					 | 
					
						
						
							
							MALL-KEFU: 完善APP端聊天消息获取
						
						
						
						
						
						
					 | 
					
						2024-06-17 17:37:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						285a431616
					 | 
					
						
						
							
							MALL-KEFU: 根据代码评审完善相关方法
						
						
						
						
						
						
					 | 
					
						2024-06-17 10:17:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d89a19a92b
					 | 
					
						
						
							
							【代码评审】商城:客服功能
						
						
						
						
						
						
					 | 
					
						2024-06-04 20:25:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2347bffeb1
					 | 
					
						
						
							
							!980 MALL-KEHU: 新增客服相关
						
						
						
						
						
						
						
						Merge pull request !980 from puhui999/develop 
						
						
					 | 
					
						2024-06-04 11:40:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						127a98a934
					 | 
					
						
						
							
							MALL-KEFU: 新增客服相关操作接口
						
						
						
						
						
						
					 | 
					
						2024-05-31 16:59:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0be9c67aa6
					 | 
					
						
						
							
							MALL-KEFU: 根据代码评审修改相关内容
						
						
						
						
						
						
					 | 
					
						2024-05-31 09:58:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						020f3a9a12
					 | 
					
						
						
							
							MALL-KEHU: 新增客服相关实体类
						
						
						
						
						
						
					 | 
					
						2024-05-30 16:09:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ae493e66df
					 | 
					
						
						
							
							MALL-TRADE:新增 BrokerageUserService#getOrCreateBrokerageUser 获得或创建分销用户方法,解决父级推广人不存在的问题
						
						
						
						
						
						
					 | 
					
						2024-05-27 16:24:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ea7f923072
					 | 
					
						
						
							
							SYSTEM:完善微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-27 16:18:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3025bff631
					 | 
					
						
						
							
							【代码评审】SYSTEM:完善微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-26 09:47:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2d44b3a245
					 | 
					
						
						
							
							!979 MEMBER: 根据【代码评审】完善微信小程序码。 修复获得个人分销统计 NPE 异常
						
						
						
						
						
						
						
						Merge pull request !979 from puhui999/develop 
						
						
					 | 
					
						2024-05-26 01:38:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b073c1d37f
					 | 
					
						
						
							
							fix: 修复获得个人分销统计 NPE 异常
						
						
						
						
						
						
					 | 
					
						2024-05-25 22:06:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b227b039c9
					 | 
					
						
						
							
							MEMBER: 根据【代码评审】完善微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-23 17:14:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						33e8c7ca2e
					 | 
					
						
						
							
							【代码评审】MEMBER:完善微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-18 20:42:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						668b97e4ed
					 | 
					
						
						
							
							!975 完善微信小程序码
						
						
						
						
						
						
						
						Merge pull request !975 from puhui999/develop 
						
						
					 | 
					
						2024-05-18 12:34:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						380ec11221
					 | 
					
						
						
							
							完善微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-16 16:57:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						52b972907a
					 | 
					
						
						
							
							member: 增加用户编号返回,分享海报有用
						
						
						
						
						
						
					 | 
					
						2024-05-14 23:29:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4c05bd340e
					 | 
					
						
						
							
							fix: 获得微信小程序码(base64 image)
						
						
						
						
						
						
					 | 
					
						2024-05-14 23:28:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4a0ad205ae
					 | 
					
						
						
							
							【代码评审】CRM:优化员工业绩统计的实现
						
						
						
						
						
						
					 | 
					
						2024-05-11 22:30:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						95a8aa9ba9
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml 
						
						
					 | 
					
						2024-05-11 22:07:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e1a5302b25
					 | 
					
						
						
							
							【修复】商城:秒杀时间段配置的 URL simple-list 不正确的问题
						
						
						
						
						
						
					 | 
					
						2024-05-11 22:05:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0641f793a3
					 | 
					
						
						
							
							【代码评审】全局:微信小程序码
						
						
						
						
						
						
					 | 
					
						2024-05-11 21:51:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						8e64de0ab2
					 | 
					
						
						
							
							!972 feat:新增获取小程序码相关接口
						
						
						
						
						
						
						
						Merge pull request !972 from puhui999/develop 
						
						
					 | 
					
						2024-05-11 13:27:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						73ef9211f9
					 | 
					
						
						
							
							feat:新增获取小程序码相关接口
						
						
						
						
						
						
					 | 
					
						2024-05-11 17:55:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scholar
							
						 
					 | 
					
						
						
							
						
						99ab07de69
					 | 
					
						
						
							
							完成todo xml部分
						
						
						
						
						
						
					 | 
					
						2024-05-11 11:35:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						52c86cd290
					 | 
					
						
						
							
							【优化】CRM:员工业绩统计的实现
						
						
						
						
						
						
					 | 
					
						2024-05-07 23:08:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d0d1d6d208
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-05-07 22:48:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						408378f5ab
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java 
						
						
					 | 
					
						2024-05-07 22:32:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scholar
							
						 
					 | 
					
						
						
							
						
						3afd2cba0c
					 | 
					
						
						
							
							完成todo部分,优化环比同比数据的计算。
						
						
						
						
						
						
					 | 
					
						2024-05-04 22:24:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c52ec92b05
					 | 
					
						
						
							
							【发版】全局:2.1.0 发版
						
						
						
						
						
						
					 | 
					
						2024-05-04 09:38:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ebd5ba02d2
					 | 
					
						
						
							
							【优化】CRM:增加对 JDK8 的兼容性,使用 ListUtil 替代 List of
						
						
						
						
						
						
					 | 
					
						2024-05-04 09:36:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b2da43f4c3
					 | 
					
						
						
							
							!965 同步 DB 转换
						
						
						
						
						
						
						
						Merge pull request !965 from 芋道源码/feature/db 
						
						
					 | 
					
						2024-05-04 01:21:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3eaa6287a0
					 | 
					
						
						
							
							【优化】全局:完善数据库转化的 README.md,清理 quartz 脚本里的无用数据
						
						
						
						
						
						
					 | 
					
						2024-05-04 09:19:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						213a6aa0fc
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2024-05-04 09:15:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a70463b961
					 | 
					
						
						
							
							!964 feat: 达梦DM8
						
						
						
						
						
						
						
						Merge pull request !964 from dhb52/feature/db 
						
						
					 | 
					
						2024-05-04 00:57:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						c24fb20311
					 | 
					
						
						
							
							feat: 测试数据库docker容器的销毁重建说明
						
						
						
						
						
						
					 | 
					
						2024-05-04 00:20:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						65651fb1ed
					 | 
					
						
						
							
							feat: 创建虚拟dual表,达梦脚本优化
						
						
						
						
						
						
					 | 
					
						2024-05-04 00:05:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						774082509b
					 | 
					
						
						
							
							feat: 达梦DM8
						
						
						
						
						
						
					 | 
					
						2024-05-03 23:22:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						93e8e9c7af
					 | 
					
						
						
							
							【优化】全局:JobController 增加 sync 接口,实现将 infra_job 同步到 Quartz 中
						
						
						
						
						
						
					 | 
					
						2024-05-03 22:37:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ffac294fbd
					 | 
					
						
						
							
							【优化】全局:兼容 MyBatis Plus 针对 SQL Server 的 saveBatch 不兼容的兼容
						
						
						
						
						
						
					 | 
					
						2024-05-03 22:11:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						df08a2ecf0
					 | 
					
						
						
							
							【优化】新增 quartz.sql,完善 README.md
						
						
						
						
						
						
					 | 
					
						2024-05-03 11:28:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |