YunaiV
							
						 
					 | 
					
						
						
							
						
						067ff6cc4d
					 | 
					
						
						
							
							✨ bugfix master 的一些 pr
						
						
						
						
						
						
					 | 
					
						2024-02-27 21:01:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9ea7bde751
					 | 
					
						
						
							
							📖 ERP:增加 ERP 首页的统计
						
						
						
						
						
						
					 | 
					
						2024-02-18 19:05:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						23ef3c8ae0
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-22 08:53:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c6c8dddfec
					 | 
					
						
						
							
							📖 CRM:code review 跟进记录
						
						
						
						
						
						
					 | 
					
						2024-01-20 19:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7914423c66
					 | 
					
						
						
							
							CRM: 完善跟进 TODO
						
						
						
						
						
						
					 | 
					
						2024-01-20 14:56:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6a6e95fcb6
					 | 
					
						
						
							
							✨ 对齐 BOOT 与 CLOUD 的代码
						
						
						
						
						
						
					 | 
					
						2024-01-19 22:13:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						023a7b14d8
					 | 
					
						
						
							
							✨ 统一 JDK8 和 JDK21 相关代码
						
						
						
						
						
						
					 | 
					
						2024-01-19 12:38:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4c200eda92
					 | 
					
						
						
							
							✨ MALL:清理多余的 MemberStatisticsDO 类
						
						
						
						
						
						
					 | 
					
						2024-01-18 00:00:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						75f2b207a4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-01-17 19:46:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dd0a2b73e8
					 | 
					
						
						
							
							✨ MALL:清理多余的 decorate 类
						
						
						
						
						
						
					 | 
					
						2024-01-17 19:45:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						adfbb1433c
					 | 
					
						
						
							
							!840 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔
						
						
						
						
						
						
						
						Merge pull request !840 from puhui999/develop 
						
						
					 | 
					
						2024-01-17 04:26:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ff9cef6a92
					 | 
					
						
						
							
							CRM: 完善跟进,新增跟进信息处理器 handler 接口✔
						
						
						
						
						
						
					 | 
					
						2024-01-17 12:00:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6dbc942cdd
					 | 
					
						
						
							
							✨ MALL:修复售后确认退款时,缺少退款描述信息
						
						
						
						
						
						
					 | 
					
						2024-01-16 22:41:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						64e1d68923
					 | 
					
						
						
							
							📖 CRM:待办事项的 code review
						
						
						
						
						
						
					 | 
					
						2024-01-15 12:15:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						50f7be9976
					 | 
					
						
						
							
							✨ MALL:简化商评论的 VO 转化,去除无用的接口
						
						
						
						
						
						
					 | 
					
						2024-01-14 13:21:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ed34b18d82
					 | 
					
						
						
							
							✨ MALL:简化商品分类的 VO 转化
						
						
						
						
						
						
					 | 
					
						2024-01-13 22:58:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8b3bfcbd6b
					 | 
					
						
						
							
							📖 MALL:code review 商品浏览记录
						
						
						
						
						
						
					 | 
					
						2024-01-13 20:23:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bbee720710
					 | 
					
						
						
							
							📖 CRM:code review 拼团记录的实现
						
						
						
						
						
						
					 | 
					
						2024-01-13 19:34:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1b87b8a42f
					 | 
					
						
						
							
							!822 接入拼团
						
						
						
						
						
						
						
						Merge pull request !822 from 疯狂的世界/develop 
						
						
					 | 
					
						2024-01-13 03:20:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf966cd610
					 | 
					
						
						
							
							✨ MALL:简化 SPU 属性 的 VO 转化
						
						
						
						
						
						
					 | 
					
						2024-01-12 23:18:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f6c8159dac
					 | 
					
						
						
							
							✨ MALL:简化 SPU 的 VO 转化
						
						
						
						
						
						
					 | 
					
						2024-01-12 22:48:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fe5c5e4223
					 | 
					
						
						
							
							✨ MALL:调整商品 SPU 字段,简化部分接口
						
						
						
						
						
						
					 | 
					
						2024-01-12 21:01:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						31a28cb40d
					 | 
					
						
						
							
							Review代码修改
						
						
						
						
						
						
					 | 
					
						2024-01-11 12:38:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						d6b59743a3
					 | 
					
						
						
							
							营销:接入 APP 装修页面
						
						
						
						
						
						
					 | 
					
						2024-01-11 11:55:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						680718c78f
					 | 
					
						
						
							
							营销:统一装修预览图片字段名称
						
						
						
						
						
						
					 | 
					
						2024-01-11 11:21:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						30fce2911f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java 
						
						
					 | 
					
						2024-01-11 11:11:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						2ab2b510cc
					 | 
					
						
						
							
							营销:修正拼团接口名称
						
						
						
						
						
						
					 | 
					
						2024-01-11 00:26:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						df609df2cf
					 | 
					
						
						
							
							商品:修正浏览记录
						
						
						
						
						
						
					 | 
					
						2024-01-11 00:25:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						63db275af1
					 | 
					
						
						
							
							✨ MALL:默认异步记录商品访问日志、访问次数
						
						
						
						
						
						
					 | 
					
						2024-01-08 19:14:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						772b794374
					 | 
					
						
						
							
							📖 CRM:code review CRM 产品分类
						
						
						
						
						
						
					 | 
					
						2024-01-08 19:08:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						df9ff3fc5c
					 | 
					
						
						
							
							🐛 MALL:修复 issue 提到的 bug
						
						
						
						
						
						
					 | 
					
						2024-01-07 20:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bbba83ef61
					 | 
					
						
						
							
							📖 MALL:code review 商品统计的代码
						
						
						
						
						
						
					 | 
					
						2024-01-07 16:23:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a259e032e1
					 | 
					
						
						
							
							✨ MALL:增加商品列表的分类编号数组、商品编号的筛选
						
						
						
						
						
						
					 | 
					
						2024-01-06 20:42:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f73cb540cf
					 | 
					
						
						
							
							✨ MALL:去除分销提现的银行配置
						
						
						
						
						
						
					 | 
					
						2024-01-05 22:46:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9c3cf1d6b6
					 | 
					
						
						
							
							!806 操作日志:完善 code review 提到的问题
						
						
						
						
						
						
						
						Merge pull request !806 from puhui999/develop 
						
						
					 | 
					
						2023-12-30 12:14:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						33c3686bef
					 | 
					
						
						
							
							✨ MALL:合并订单和售后订单的数量接口
						
						
						
						
						
						
					 | 
					
						2023-12-28 23:15:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f3f3d789b
					 | 
					
						
						
							
							✨ MALL:营销文章增加 title 查询,简易解决常见问题、用户协议的编辑
						
						
						
						
						
						
					 | 
					
						2023-12-27 22:07:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c019136f07
					 | 
					
						
						
							
							✨ Member:增加积分记录的时间筛选
						
						
						
						
						
						
					 | 
					
						2023-12-27 20:39:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e5377074d5
					 | 
					
						
						
							
							数据权限:完善 code review 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-12-26 00:21:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5de6a8bd23
					 | 
					
						
						
							
							📖 code review:操作日志的实现
						
						
						
						
						
						
					 | 
					
						2023-12-25 21:40:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7286f33a7f
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2023-12-24 00:32:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						60e684c455
					 | 
					
						
						
							
							营销活动:获取商品近期参与的每个活动新增满减送和限时折扣活动
						
						
						
						
						
						
					 | 
					
						2023-12-24 00:32:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d65c28d7f7
					 | 
					
						
						
							
							✨ Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑
						
						
						
						
						
						
					 | 
					
						2023-12-23 09:59:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						106c1ecf4c
					 | 
					
						
						
							
							📖 code review:店铺装修逻辑
						
						
						
						
						
						
					 | 
					
						2023-12-19 23:11:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0944584029
					 | 
					
						
						
							
							商品:用户未登录时,不记录商品浏览记录
						
						
						
						
						
						
					 | 
					
						2023-12-19 21:44:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0b7d42482f
					 | 
					
						
						
							
							统计:增加商品统计定时任务
						
						
						
						
						
						
					 | 
					
						2023-12-17 19:30:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						f374e778bb
					 | 
					
						
						
							
							商品:增加商品浏览记录
						
						
						
						
						
						
					 | 
					
						2023-12-17 17:20:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |