|  | 9203f485e9 | Merge remote-tracking branch 'origin/develop' 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-05 15:40:29 +08:00 |  | 
			
				
					|  | d8bb55fc0b | CRM-客户:完善操作日志 | 2024-01-05 14:43:48 +08:00 |  | 
			
				
					|  | ee250c74d6 | ✨ MALL:更新 uni-app + Vue3 实现 | 2024-01-05 01:28:39 +08:00 |  | 
			
				
					|  | ea4b4b8956 | CRM-客户:精简 VO | 2024-01-05 00:15:26 +08:00 |  | 
			
				
					|  | e6f4c1f0d5 | Merge remote-tracking branch 'yudao/develop' into develop | 2024-01-04 09:59:50 +08:00 |  | 
			
				
					|  | a974d055b6 | 📖 CRM:【还款】code review 还款的代码,补全对应的 todo list | 2024-01-04 09:41:58 +08:00 |  | 
			
				
					|  | c6a9751511 | 📖 CRM:【合同】code review 合同的代码,补全对应的 todo list | 2024-01-04 09:18:44 +08:00 |  | 
			
				
					|  | 2668e0cfeb | 📖 CRM:【产品】code review 产品的代码,补全对应的 todo list | 2024-01-04 08:01:04 +08:00 |  | 
			
				
					|  | b9f1e8ffaf | 📖 CRM:【联系人】code review 商机的代码,补全对应的 todo list | 2024-01-04 07:53:00 +08:00 |  | 
			
				
					|  | 02324f9e60 | ✨ CRM:【联系人】统一字段 | 2024-01-03 23:30:25 +08:00 |  | 
			
				
					|  | cff6e520ee | 📖 CRM:【联系人】code review 联系人的代码,补全对应的 todo list | 2024-01-03 22:07:20 +08:00 |  | 
			
				
					|  | f8f5e525be | ✨ CRM:新增跟进记录表 | 2024-01-03 20:56:28 +08:00 |  | 
			
				
					|  | 2e7c3e09a9 | 📖 CRM:code review 所有代码,补充对应 todo | 2024-01-03 19:38:13 +08:00 |  | 
			
				
					|  | d0df0e8e16 | 📖 CRM:【客户】优化锁定客户的逻辑实现 | 2024-01-03 13:06:49 +08:00 |  | 
			
				
					|  | e18ac461ea | fix: 修复公众号模块,当粉丝第一次关注的时候会出现错误(公众号粉丝不存在) | 2024-01-03 11:11:20 +08:00 |  | 
			
				
					|  | 90bdc1fd83 | fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题 | 2024-01-03 10:09:41 +08:00 |  | 
			
				
					|  | 0253846fdf | Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop # Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java | 2024-01-02 22:21:14 +08:00 |  | 
			
				
					|  | 1da8006af3 | 📖 CRM:【客户】完善列表、新增、修改接口的 todo | 2024-01-02 21:45:02 +08:00 |  | 
			
				
					|  | 9e3055ee1e | 📖 CRM:code review 商机模块 | 2024-01-02 18:49:14 +08:00 |  | 
			
				
					|  | 2d0537387b | Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop # Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java | 2023-12-30 21:43:04 +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 |  | 
			
				
					|  | 8a947990f4 | 🐛 升级 easyexcel 依赖,解决 JDK21 导出报错 | 2023-12-30 19:22:58 +08:00 |  | 
			
				
					|  | 2fb36563ec | 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 | 2023-12-30 12:01:12 +08:00 |  | 
			
				
					|  | 51968c4c19 | 🐛 腾讯云上传 bug | 2023-12-30 11:23:59 +08:00 |  | 
			
				
					|  | 078ead536b | 🐛 REPORT:支持 SaaS 租户模式 | 2023-12-30 10:30:47 +08:00 |  | 
			
				
					|  | 9a03f1a796 | 🐛 BPM:多租户的工作流隔离 | 2023-12-30 09:38:01 +08:00 |  | 
			
				
					|  | b5e19c63f7 | !799 解决审批流自定义脚本无法获取流程变量 Merge pull request !799 from xiuuuu/master-jdk21 | 2023-12-29 14:34:06 +00:00 |  | 
			
				
					|  | d31a12aff7 | 🐛 修改了支付 demo 退款单匹配错误问题 | 2023-12-29 22:33:26 +08:00 |  | 
			
				
					|  | ed1b55fed7 | 🐛 文件路径 url 中文解码问题 | 2023-12-29 22:20:59 +08:00 |  | 
			
				
					|  | 0f6f204320 | 🐛 修改 pay模块>支付订单的同步 Job,查询指定创建时间前的待支付订单 | 2023-12-29 21:52:49 +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 |  | 
			
				
					|  | 33c3686bef | ✨ MALL:合并订单和售后订单的数量接口 | 2023-12-28 23:15:25 +08:00 |  | 
			
				
					|  | 1f3f3d789b | ✨ MALL:营销文章增加 title 查询,简易解决常见问题、用户协议的编辑 | 2023-12-27 22:07:54 +08:00 |  | 
			
				
					|  | c019136f07 | ✨ Member:增加积分记录的时间筛选 | 2023-12-27 20:39:14 +08:00 |  | 
			
				
					|  | e5377074d5 | 数据权限:完善 code review 提到的问题 | 2023-12-26 00:21:04 +08:00 |  | 
			
				
					|  | 6950368991 | 操作日志:完善 code review 提到的问题 | 2023-12-26 00:04:20 +08:00 |  | 
			
				
					|  | 2f5afdb5c9 | ✨ Member:增加使用微信小程序 code 绑定手机号 | 2023-12-25 23:33:50 +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 |  | 
			
				
					|  | 525d41bad1 | !805 重构操作日志记录实现;CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑 Merge pull request !805 from puhui999/develop | 2023-12-25 00:42:51 +00:00 |  | 
			
				
					|  | 7286f33a7f | Merge remote-tracking branch 'yudao/develop' into develop | 2023-12-24 00:32:47 +08:00 |  | 
			
				
					|  | 60e684c455 | 营销活动:获取商品近期参与的每个活动新增满减送和限时折扣活动 | 2023-12-24 00:32:17 +08:00 |  | 
			
				
					|  | bd5c7d57dc | ✨ Member:社交(三方)绑定接口,增加 openid 返回 | 2023-12-23 22:54:20 +08:00 |  | 
			
				
					|  | 7b482f5729 | ✨ Member:增加获取单个社交用户的接口 | 2023-12-23 21:48:33 +08:00 |  |