|  | 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 |  | 
			
				
					|  | 9fbbce4e8d | 📖 BPMN:code review bpmn 中辅助查找代码 | 2024-02-03 16:12:27 +08:00 |  | 
			
				
					|  | b2370564a4 | feat: 添加查找用户的处理器,用于在bpmn中辅助查找用户 | 2024-02-03 15:41:53 +08:00 |  | 
			
				
					|  | 59e6f23788 | CRM-CONTRACT: 完善 TODO | 2024-02-03 12:29:28 +08:00 |  | 
			
				
					|  | 722223c659 | Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop # Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java | 2024-01-27 16:44:58 +08:00 |  | 
			
				
					|  | 524ee8c467 | ✨ 全局:将 sms 融合到 system 模块里,减少 starter | 2024-01-27 13:06:15 +08:00 |  | 
			
				
					|  | 5acdd1554e | ✨ 全局:将 sms 融合到 system 模块里,减少 starter | 2024-01-27 11:25:43 +08:00 |  | 
			
				
					|  | 5b69df074c | ✨ 全局:将 banner、error-code、desensitize 融合到 web 组件里,减少 starter | 2024-01-27 10:25:25 +08:00 |  | 
			
				
					|  | 16fd1a9639 | 🐛 oracle limit 查询不正确 | 2024-01-20 18:46:51 +08:00 |  | 
			
				
					|  | fcef0f7f50 | ✨ 升级最新依赖 | 2024-01-19 22:40:59 +08:00 |  | 
			
				
					|  | 023a7b14d8 | ✨ 统一 JDK8 和 JDK21 相关代码 | 2024-01-19 12:38:57 +08:00 |  | 
			
				
					|  | 5ae1d0ab3e | fix: 修复3处问题 1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题 | 2024-01-16 11:09:02 +08:00 |  | 
			
				
					|  | d58da7b2b0 | 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/90/files pr | 2024-01-13 21:08:52 +08:00 |  | 
			
				
					|  | e79c750b46 | 📖 CRM:code review 跟进记录的实现 | 2024-01-13 09:56:53 +08:00 |  | 
			
				
					|  | d80406acbb | Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop # Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java | 2024-01-13 09:23:56 +08:00 |  | 
			
				
					|  | f6c8159dac | ✨ MALL:简化 SPU 的 VO 转化 | 2024-01-12 22:48:58 +08:00 |  | 
			
				
					|  | 9bba1ce8a4 | 新增 ParseFunctionNameConstants 常量枚举 | 2024-01-10 11:29:29 +08:00 |  | 
			
				
					|  | 2d1e57554d | 📖 CRM:code review CRM 客户逻辑 | 2024-01-07 22:07:17 +08:00 |  | 
			
				
					|  | 3c7f63c356 | !810 fix:修复 issues 提到的一些公众号上的问题 Merge pull request !810 from puhui999/develop | 2024-01-07 13:23:53 +00:00 |  | 
			
				
					|  | bbba83ef61 | 📖 MALL:code review 商品统计的代码 | 2024-01-07 16:23:02 +08:00 |  | 
			
				
					|  | eb048532f7 | Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop # Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java | 2024-01-06 21:52:10 +08:00 |  | 
			
				
					|  | 68f5edaa88 | CRM-客户: 完善一些 TODO | 2024-01-06 15:28:10 +08:00 |  | 
			
				
					|  | ea4b4b8956 | CRM-客户:精简 VO | 2024-01-05 00:15:26 +08:00 |  | 
			
				
					|  | 8c9b483ac5 | 📖 code review 操作日志的实现 | 2023-12-30 21:36:46 +08:00 |  | 
			
				
					|  | 9c3cf1d6b6 | !806 操作日志:完善 code review 提到的问题 Merge pull request !806 from puhui999/develop | 2023-12-30 12:14:40 +00:00 |  | 
			
				
					|  | 290f45dd6e | Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop # Conflicts:
#	yudao-server/src/main/resources/application-local.yaml | 2023-12-30 20:11:07 +08:00 |  | 
			
				
					|  | 2fb36563ec | 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 | 2023-12-30 12:01:12 +08:00 |  | 
			
				
					|  | 51968c4c19 | 🐛 腾讯云上传 bug | 2023-12-30 11:23:59 +08:00 |  | 
			
				
					|  | 9a03f1a796 | 🐛 BPM:多租户的工作流隔离 | 2023-12-30 09:38:01 +08:00 |  | 
			
				
					|  | 475e932aec | 🐛 导出 Excel:Long 类型 ID 会丢失精度 | 2023-12-29 21:45:43 +08:00 |  | 
			
				
					|  | 0861372755 | 🐛 修复修改短信渠道缓存没有更新 | 2023-12-29 12:59:20 +08:00 |  | 
			
				
					|  | 829965e50a | 🐛 fix(websocket): 修复 websocket 失效的问题 | 2023-12-29 12:54:52 +08:00 |  | 
			
				
					|  | 08ff391f78 | 🐛 Websocket 断开时,未删除会话缓存 bug | 2023-12-29 12:48:36 +08:00 |  | 
			
				
					|  | 6950368991 | 操作日志:完善 code review 提到的问题 | 2023-12-26 00:04:20 +08:00 |  | 
			
				
					|  | 5de6a8bd23 | 📖 code review:操作日志的实现 | 2023-12-25 21:40:16 +08:00 |  | 
			
				
					|  | 82a25474f6 | Merge remote-tracking branch 'origin/develop' into develop | 2023-12-25 08:43:38 +08:00 |  | 
			
				
					|  | 7542b6a78d | ✨ Member:完善微信相关配置 | 2023-12-25 08:43:32 +08:00 |  | 
			
				
					|  | 7286f33a7f | Merge remote-tracking branch 'yudao/develop' into develop | 2023-12-24 00:32:47 +08:00 |  | 
			
				
					|  | e8ade5f1fe | crm:完善一些遗留的 TODO | 2023-12-23 20:10:40 +08:00 |  | 
			
				
					|  | d65c28d7f7 | ✨ Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑 | 2023-12-23 09:59:58 +08:00 |  | 
			
				
					|  | f56d8a2751 | 重构操作日志记录实现 | 2023-12-19 18:34:51 +08:00 |  | 
			
				
					|  | 1fae341cae | 重构操作日志记录实现 | 2023-12-19 16:29:13 +08:00 |  | 
			
				
					|  | cd45fc35ea | Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop | 2023-12-19 12:27:11 +08:00 |  | 
			
				
					|  | 3bab9748db | 系统操作日志:使用自定义 starter 的方式重新集成 mzt-biz-log | 2023-12-19 09:20:47 +08:00 |  | 
			
				
					|  | 5851bcb479 | Merge remote-tracking branch 'origin/develop' into develop | 2023-12-17 10:05:13 +08:00 |  | 
			
				
					|  | 4a007f0c98 | 统计:增加商品统计 | 2023-12-16 23:48:10 +08:00 |  | 
			
				
					|  | 63431082e5 | member: 完善连续签到 review 提到的问题 | 2023-12-11 16:37:14 +08:00 |  | 
			
				
					|  | a6a9f4e3a6 | 增加 东莞市下面的行政区信息 Signed-off-by: 风狗 <909275705@qq.com> | 2023-12-11 02:47:22 +00:00 |  | 
			
				
					|  | 23df8633f4 | 📖 CRM:code review 数据权限的实现 | 2023-12-09 10:50:47 +08:00 |  | 
			
				
					|  | 10d245afc3 | 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 | 2023-12-08 22:17:13 +08:00 |  |