YunaiV
							
						 
					 | 
					
						
						
							
						
						cfbc2ed74c
					 | 
					
						
						
							
							code review:订单列表、订单详情
						
						
						
						
						
						
					 | 
					
						2023-08-23 00:43:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						be143ea21b
					 | 
					
						
						
							
							订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
						
						
						
						
						
						
					 | 
					
						2023-08-22 17:36:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						71f9337d82
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-08-22 00:39:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						345c09ee6c
					 | 
					
						
						
							
							订单列表:列表重构 ② and 完善订单详情
						
						
						
						
						
						
					 | 
					
						2023-08-21 22:39:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4bc3f15571
					 | 
					
						
						
							
							code review:积分记录
						
						
						
						
						
						
					 | 
					
						2023-08-20 19:06:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						620a2009c3
					 | 
					
						
						
							
							fix: 支付管理/退款订单 对标 vue2
						
						
						
						
						
						
					 | 
					
						2023-08-13 01:26:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7625e6757c
					 | 
					
						
						
							
							code review:优化收银台的实现,解决 TODO
						
						
						
						
						
						
					 | 
					
						2023-08-10 23:30:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						a6eab3cc9a
					 | 
					
						
						
							
							feat: 支付功能迁移(初稿)
						
						
						
						
						
						
					 | 
					
						2023-08-06 23:25:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						323417b0d4
					 | 
					
						
						
							
							feat: 支付管理/应用信息(alpha)
						
						
						
						
						
						
					 | 
					
						2023-08-03 23:07:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4057130275
					 | 
					
						
						
							
							fix: mall SeckillActivity and CombinationActivity
						
						
						
						
						
						
					 | 
					
						2023-07-05 18:24:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a5330958ba
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-07-03 07:59:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4571f893ed
					 | 
					
						
						
							
							review 积分配置
						
						
						
						
						
						
					 | 
					
						2023-07-02 23:18:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2e96b1c984
					 | 
					
						
						
							
							feat: mall CombinationActivity
						
						
						
						
						
						
					 | 
					
						2023-07-02 19:22:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						4251dc5d61
					 | 
					
						
						
							
							会员中心代码
						
						
						
						
						
						
						
						1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码 
						
						
					 | 
					
						2023-06-28 22:50:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5d613e69b3
					 | 
					
						
						
							
							review 营销活动
						
						
						
						
						
						
					 | 
					
						2023-06-24 18:53:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c9ae0fbdbe
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-24 01:48:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b159240824
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue 
						
						
					 | 
					
						2023-06-23 13:54:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ee698fd8b2
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:21:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						a75720ec06
					 | 
					
						
						
							
							feat: 秒杀时段管理
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:20:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e3f250fff0
					 | 
					
						
						
							
							code review:订单列表
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:02:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						867c47de61
					 | 
					
						
						
							
							!165 trade-order 列表和详情初版
						
						
						
						
						
						
						
						Merge pull request !165 from 矿泉水/dev 
						
						
					 | 
					
						2023-06-17 11:04:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1e49a8eaf0
					 | 
					
						
						
							
							!170 Expiration time should not set on the refresh token
						
						
						
						
						
						
						
						Merge pull request !170 from 呵呵大/N/A 
						
						
					 | 
					
						2023-06-17 11:02:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5eaf054646
					 | 
					
						
						
							
							code review:会员积分配置
						
						
						
						
						
						
					 | 
					
						2023-06-17 18:33:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						023539b0db
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	package.json
	src/utils/dict.ts 
						
						
					 | 
					
						2023-06-17 17:40:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8666307d47
					 | 
					
						
						
							
							code review:处理字典数据的冲突
						
						
						
						
						
						
					 | 
					
						2023-06-17 17:38:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						1dca8476b3
					 | 
					
						
						
							
							初始化积分模块
						
						
						
						
						
						
						
						1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理 
						
						
					 | 
					
						2023-06-10 20:57:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								呵呵大
							
						 
					 | 
					
						
						
							
						
						5554d7c995
					 | 
					
						
						
							
							Expiration time should not set on the refresh token
						
						
						
						
						
						
						
						登录接口返回的过期时间是`access token` 的过期时间,但是被错误地设置在了`refresh token` 上,这导致过了几分钟登录状态便失效要求重新登录 
						
						
					 | 
					
						2023-06-10 03:19:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b89db1af55
					 | 
					
						
						
							
							fix: review
						
						
						
						
						
						
					 | 
					
						2023-06-06 16:22:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						e2d795f49d
					 | 
					
						
						
							
							add trade order 20230606
						
						
						
						
						
						
					 | 
					
						2023-06-06 01:36:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						ec3b028d55
					 | 
					
						
						
							
							sync dev-20230606
						
						
						
						
						
						
					 | 
					
						2023-06-06 01:25:22 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						158585670c
					 | 
					
						
						
							
							code review:商品管理
						
						
						
						
						
						
					 | 
					
						2023-06-03 20:50:07 +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
							
						 
					 | 
					
						
						
							
						
						39c92cb944
					 | 
					
						
						
							
							fix: 完善 SPU 查看详情
						
						
						
						
						
						
					 | 
					
						2023-05-31 14:42:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e555977757
					 | 
					
						
						
							
							fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
						
						
						
						
						
						
					 | 
					
						2023-05-30 18:14:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						c3b0403ade
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-05-29 18:23:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						ed9f042975
					 | 
					
						
						
							
							feat: mall 优惠券 初稿
						
						
						
						
						
						
					 | 
					
						2023-05-26 18:19:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0fba3fd503
					 | 
					
						
						
							
							review + mall:商品管理
						
						
						
						
						
						
					 | 
					
						2023-05-24 20:27:45 +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
							
						 
					 | 
					
						
						
							
						
						0c42b76a52
					 | 
					
						
						
							
							fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
						
						
						
						
						
						
					 | 
					
						2023-05-19 17:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						43e541f944
					 | 
					
						
						
							
							fix: 移动copyValueToTarget方法到utils/index中
						
						
						
						
						
						
					 | 
					
						2023-05-16 10:12:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e92361ed40
					 | 
					
						
						
							
							code review 商品管理的实现
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:54:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0c6e3a39c9
					 | 
					
						
						
							
							商品管理: 打通所有接口(第一版)
						
						
						
						
						
						
					 | 
					
						2023-05-04 01:38:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1116fb278b
					 | 
					
						
						
							
							商品管理: 调整相关组件优化逻辑
						
						
						
						
						
						
					 | 
					
						2023-05-02 02:20:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6478d295df
					 | 
					
						
						
							
							商品管理: 调整相关组件优化逻辑
						
						
						
						
						
						
					 | 
					
						2023-05-01 19:01:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						c38abc365c
					 | 
					
						
						
							
							商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑
						
						
						
						
						
						
					 | 
					
						2023-04-26 17:17:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |