xiaobai
							
						 
					 | 
					
						
						
							
						
						985d764f62
					 | 
					
						
						
							
							20230606 add trade-order and details
						
						
						
						
						
						
					 | 
					
						2023-06-06 01:08:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7fe8dee9ed
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-05 08:35:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						51e76ffd53
					 | 
					
						
						
							
							code review:优惠劵管理
						
						
						
						
						
						
					 | 
					
						2023-06-03 23:15:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7c6d7e8061
					 | 
					
						
						
							
							!164 优惠券迁移vue3
						
						
						
						
						
						
						
						Merge pull request !164 from dhb52/dev 
						
						
					 | 
					
						2023-06-03 15:02:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a1b45f80bc
					 | 
					
						
						
							
							fix: 优化 spu 相关路由配置
						
						
						
						
						
						
					 | 
					
						2023-06-03 21:21:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						158585670c
					 | 
					
						
						
							
							code review:商品管理
						
						
						
						
						
						
					 | 
					
						2023-06-03 20:50:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						541b23c8c1
					 | 
					
						
						
							
							!159 完善商品查看详情,修改了一些问题
						
						
						
						
						
						
						
						Merge pull request !159 from puhui999/dev-to-dev 
						
						
					 | 
					
						2023-06-03 12:09:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						60c1604d49
					 | 
					
						
						
							
							code review:门店自提、快递运费
						
						
						
						
						
						
					 | 
					
						2023-06-03 19:52:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						505f5cfa0c
					 | 
					
						
						
							
							临时提交
						
						
						
						
						
						
					 | 
					
						2023-06-02 16:10:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						c5a7d05821
					 | 
					
						
						
							
							style: 添加VO
						
						
						
						
						
						
					 | 
					
						2023-06-01 18:08:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						91a5f8044c
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-01 11:55:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7fb6258bed
					 | 
					
						
						
							
							fix: 修复善品测试发现的问题
						
						
						
						
						
						
					 | 
					
						2023-06-01 11:54:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6a10a81f58
					 | 
					
						
						
							
							fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
						
						
						
						
						
						
					 | 
					
						2023-05-31 15:58:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2ddb605076
					 | 
					
						
						
							
							fix: 完善 SPU 选择快递模版的功能
						
						
						
						
						
						
					 | 
					
						2023-05-31 15:37:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						39c92cb944
					 | 
					
						
						
							
							fix: 完善 SPU 查看详情
						
						
						
						
						
						
					 | 
					
						2023-05-31 14:42:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						000aa95012
					 | 
					
						
						
							
							新增门店自提管理
						
						
						
						
						
						
					 | 
					
						2023-05-30 21:21:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e555977757
					 | 
					
						
						
							
							fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
						
						
						
						
						
						
					 | 
					
						2023-05-30 18:14:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fa6bcacaef
					 | 
					
						
						
							
							!157 合并商城部分功能
						
						
						
						
						
						
						
						Merge pull request !157 from 芋道源码/dev 
						
						
					 | 
					
						2023-05-29 15:03:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ee12fa01c9
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
						
						
						
						
						
						
						
						 Conflicts:
	package.json 
						
						
					 | 
					
						2023-05-29 22:34:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lour6498
							
						 
					 | 
					
						
						
							
						
						257ad9f79f
					 | 
					
						
						
							
							fix: 公告内容不能为空
						
						
						
						
						
						
					 | 
					
						2023-05-29 18:44:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						c3b0403ade
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-05-29 18:23:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						70c5082776
					 | 
					
						
						
							
							运费模板区域改成多选
						
						
						
						
						
						
					 | 
					
						2023-05-27 11:32:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						ed9f042975
					 | 
					
						
						
							
							feat: mall 优惠券 初稿
						
						
						
						
						
						
					 | 
					
						2023-05-26 18:19:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b12aefe46e
					 | 
					
						
						
							
							review + mall:快递公司管理
						
						
						
						
						
						
					 | 
					
						2023-05-24 23:40:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						349a39e72f
					 | 
					
						
						
							
							review + mall:商品管理
						
						
						
						
						
						
					 | 
					
						2023-05-24 20:32:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ae49aaffcf
					 | 
					
						
						
							
							Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/mall/product/spu/index.vue 
						
						
					 | 
					
						2023-05-24 20:31:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0fba3fd503
					 | 
					
						
						
							
							review + mall:商品管理
						
						
						
						
						
						
					 | 
					
						2023-05-24 20:27:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d877bfd26e
					 | 
					
						
						
							
							fix: 完善善品导出
						
						
						
						
						
						
					 | 
					
						2023-05-23 12:04:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						c296c9e53d
					 | 
					
						
						
							
							运费模板表格样式调整
						
						
						
						
						
						
					 | 
					
						2023-05-22 23:57:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						af2fb4bf5f
					 | 
					
						
						
							
							运费模板性能优化。区域选择使用懒加载
						
						
						
						
						
						
					 | 
					
						2023-05-22 23:10:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						855e4d3d02
					 | 
					
						
						
							
							!153 提交商品管理第二版
						
						
						
						
						
						
						
						Merge pull request !153 from puhui999/dev-to-dev 
						
						
					 | 
					
						2023-05-21 16:01:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						4e69f15128
					 | 
					
						
						
							
							mall: 订单中心->运费模板(第一版 性能有问题)
						
						
						
						
						
						
					 | 
					
						2023-05-21 23:41:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						39e329b8a3
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-05-20 12:06:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						38545e89c6
					 | 
					
						
						
							
							fix: 优化相关逻辑,修复遗留bug
						
						
						
						
						
						
					 | 
					
						2023-05-20 12:05:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0c42b76a52
					 | 
					
						
						
							
							fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
						
						
						
						
						
						
					 | 
					
						2023-05-19 17:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						45ee4116b7
					 | 
					
						
						
							
							fix: echart
						
						
						
						
						
						
					 | 
					
						2023-05-19 15:24:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						b0984c9013
					 | 
					
						
						
							
							新增快递公司菜单
						
						
						
						
						
						
					 | 
					
						2023-05-18 23:40:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4ddba9d454
					 | 
					
						
						
							
							fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
						
						
						
						
						
						
					 | 
					
						2023-05-17 18:24:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						3c4a39df01
					 | 
					
						
						
							
							fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug
						
						
						
						
						
						
					 | 
					
						2023-05-17 01:41:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9c06832d7e
					 | 
					
						
						
							
							fix: 修复 SkuList TODO 优化相关算法
						
						
						
						
						
						
					 | 
					
						2023-05-17 01:39:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6ac8c78d57
					 | 
					
						
						
							
							fix: 添加商品属性去掉备注
						
						
						
						
						
						
					 | 
					
						2023-05-17 01:37:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						52bfc4dac0
					 | 
					
						
						
							
							fix: 进一步完善商品列表,修复TODO
						
						
						
						
						
						
					 | 
					
						2023-05-17 01:17:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						43e541f944
					 | 
					
						
						
							
							fix: 移动copyValueToTarget方法到utils/index中
						
						
						
						
						
						
					 | 
					
						2023-05-16 10:12:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						16561b1238
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	build/vite/optimize.ts 
						
						
					 | 
					
						2023-05-15 22:58:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3feb4828cd
					 | 
					
						
						
							
							!148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现
						
						
						
						
						
						
					 | 
					
						2023-05-15 22:57:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						ab7032f1ca
					 | 
					
						
						
							
							!148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现
						
						
						
						
						
						
						
						Merge pull request !148 from Chika/dev 
						
						
					 | 
					
						2023-05-15 14:51:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						c47cc18b24
					 | 
					
						
						
							
							!147 refactor: mp/autoReply 拆分ReplyForm组件
						
						
						
						
						
						
						
						Merge pull request !147 from dhb52/dev 
						
						
					 | 
					
						2023-05-15 14:49:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cxr01
							
						 
					 | 
					
						
						
							
						
						a788921d51
					 | 
					
						
						
							
							修复后台”在线用户强退“功能
						
						
						
						
						
						
					 | 
					
						2023-05-14 13:46:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chika
							
						 
					 | 
					
						
						
							
						
						fbac522149
					 | 
					
						
						
							
							Redis监控用Echart组件整改
						
						
						
						
						
						
					 | 
					
						2023-05-12 16:10:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chika
							
						 
					 | 
					
						
						
							
						
						8456c671e8
					 | 
					
						
						
							
							Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
					 | 
					
						2023-05-12 15:50:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |