puhui999
							
						 
					 | 
					
						
						
							
						
						a1b45f80bc
					 | 
					
						
						
							
							fix: 优化 spu 相关路由配置
						
						
						
						
						
						
					 | 
					
						2023-06-03 21:21:43 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						820d8ab76a
					 | 
					
						
						
							
							fix: pnpm 仓库中没有 video.js 8.0.4 这个版本,更改为 8.3.0
						
						
						
						
						
						
					 | 
					
						2023-05-30 10:00:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						70c5082776
					 | 
					
						
						
							
							运费模板区域改成多选
						
						
						
						
						
						
					 | 
					
						2023-05-27 11:32:16 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						50b181318b
					 | 
					
						
						
							
							fix: 整合spu,移动相关类型到spu删除对应文件和文件夹
						
						
						
						
						
						
					 | 
					
						2023-05-16 10:53:36 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fa618ca44a
					 | 
					
						
						
							
							!151 修复后台”在线用户强退“功能
						
						
						
						
						
						
						
						Merge pull request !151 from cxr/master 
						
						
					 | 
					
						2023-05-15 14:47: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chika
							
						 
					 | 
					
						
						
							
						
						bf629a9554
					 | 
					
						
						
							
							Redis监控图标使用Echart组件整合
						
						
						
						
						
						
					 | 
					
						2023-05-12 15:30:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e92361ed40
					 | 
					
						
						
							
							code review 商品管理的实现
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:54:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						be49c381f6
					 | 
					
						
						
							
							refactor: mp/autoReply 拆分ReplyForm组件
						
						
						
						
						
						
					 | 
					
						2023-05-05 23:04:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4a965b8c14
					 | 
					
						
						
							
							!141 商品管理: 打通所有接口(第一版)
						
						
						
						
						
						
						
						Merge pull request !141 from puhui999/dev-to-dev 
						
						
					 | 
					
						2023-05-05 11:03:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						f1cf125f0d
					 | 
					
						
						
							
							!146 refactor: mp/wx-msg拆分Msg组件
						
						
						
						
						
						
						
						Merge pull request !146 from dhb52/dev 
						
						
					 | 
					
						2023-05-05 11:02:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						63cb62e697
					 | 
					
						
						
							
							!139 fix(styles/index): Update .el-scrollbar__bar style
						
						
						
						
						
						
						
						Merge pull request !139 from AhJindeg/fix_tab-scrollbar-style 
						
						
					 | 
					
						2023-05-05 11:00:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7a64bbdea0
					 | 
					
						
						
							
							!145 修复【站内信】测试模板消息发送,接口调用错误问题
						
						
						
						
						
						
						
						Merge pull request !145 from ZanGe丶/master 
						
						
					 | 
					
						2023-05-05 10:54:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						2b84489969
					 | 
					
						
						
							
							refactor: mp/wx-msg拆分Msg组件
						
						
						
						
						
						
					 | 
					
						2023-05-04 22:45:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1c77ba8e04
					 | 
					
						
						
							
							code review 微信的实现
						
						
						
						
						
						
					 | 
					
						2023-05-04 21:00:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0c6e3a39c9
					 | 
					
						
						
							
							商品管理: 打通所有接口(第一版)
						
						
						
						
						
						
					 | 
					
						2023-05-04 01:38:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9ee35fc165
					 | 
					
						
						
							
							商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显
						
						
						
						
						
						
					 | 
					
						2023-05-03 02:28:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1116fb278b
					 | 
					
						
						
							
							商品管理: 调整相关组件优化逻辑
						
						
						
						
						
						
					 | 
					
						2023-05-02 02:20:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |