puhui999
							
						 
					 | 
					
						
						
							
						
						83e780da06
					 | 
					
						
						
							
							订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
						
						
						
						
						
						
					 | 
					
						2023-08-22 17:42:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						be143ea21b
					 | 
					
						
						
							
							订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
						
						
						
						
						
						
					 | 
					
						2023-08-22 17:36:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ebcbe63d9b
					 | 
					
						
						
							
							订单列表:列表重构 ④ 移除测试数据
						
						
						
						
						
						
					 | 
					
						2023-08-22 11:01:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						71f9337d82
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-08-22 00:39:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0d202a7a85
					 | 
					
						
						
							
							订单列表:列表重构 ③ 添加备注表单和发货表单
						
						
						
						
						
						
					 | 
					
						2023-08-22 00:38:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						345c09ee6c
					 | 
					
						
						
							
							订单列表:列表重构 ② and 完善订单详情
						
						
						
						
						
						
					 | 
					
						2023-08-21 22:39:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1db98698bd
					 | 
					
						
						
							
							优化商品属性的编辑按钮
						
						
						
						
						
						
					 | 
					
						2023-08-21 10:34:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						be485cc4ab
					 | 
					
						
						
							
							code review:签到记录
						
						
						
						
						
						
					 | 
					
						2023-08-20 19:34:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						82628ce780
					 | 
					
						
						
							
							code review:签到配置
						
						
						
						
						
						
					 | 
					
						2023-08-20 19:26:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4bc3f15571
					 | 
					
						
						
							
							code review:积分记录
						
						
						
						
						
						
					 | 
					
						2023-08-20 19:06:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						76a63e01c9
					 | 
					
						
						
							
							code review:会员签到配置
						
						
						
						
						
						
					 | 
					
						2023-08-20 10:14:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						cbd3d6c9a2
					 | 
					
						
						
							
							!204 会员积分和会员签到模块todo修改
						
						
						
						
						
						
						
						Merge pull request !204 from QingX/dev 
						
						
					 | 
					
						2023-08-20 01:46:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a99a125c2b
					 | 
					
						
						
							
							!207 会员管理:增加会员标签功能
						
						
						
						
						
						
						
						Merge pull request !207 from 疯狂的世界/member_dev 
						
						
					 | 
					
						2023-08-20 01:16:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						161feab244
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-08-20 02:16:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2eb740765e
					 | 
					
						
						
							
							订单列表:列表重构 ①
						
						
						
						
						
						
					 | 
					
						2023-08-20 02:16:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						2964d55435
					 | 
					
						
						
							
							会员:
						
						
						
						
						
						
						
						1.会员设置标签 
						
						
					 | 
					
						2023-08-19 20:19:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						334962fe09
					 | 
					
						
						
							
							会员:
						
						
						
						
						
						
						
						1.增加会员标签功能 
						
						
					 | 
					
						2023-08-19 16:03:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						848b668979
					 | 
					
						
						
							
							!205 同步 master 代码到 dev
						
						
						
						
						
						
						
						Merge pull request !205 from 芋道源码/master 
						
						
					 | 
					
						2023-08-19 08:00:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cb4c78b1ac
					 | 
					
						
						
							
							会员中心:会员管理 60%
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:44:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						f96882c841
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:13:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4fd9dfd1f8
					 | 
					
						
						
							
							会员中心:会员管理 50%
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:11:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						19444021ca
					 | 
					
						
						
							
							会员积分和会员签到模块todo修改
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:10:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						916e93ab2e
					 | 
					
						
						
							
							fix: 解决右侧代码过长时不缩放啥也做不了的 bug
						
						
						
						
						
						
					 | 
					
						2023-08-17 14:56:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						44be35b5ce
					 | 
					
						
						
							
							fix: 完善砍价活动管理对齐后端
						
						
						
						
						
						
					 | 
					
						2023-08-17 10:52:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a3f2a01eb0
					 | 
					
						
						
							
							!198 fix: 修复支付的一些小问题
						
						
						
						
						
						
						
						Merge pull request !198 from dhb52/master 
						
						
					 | 
					
						2023-08-15 13:22:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						c7b8fdb884
					 | 
					
						
						
							
							fix: 支付/示例 queryParams 为 reactive
						
						
						
						
						
						
					 | 
					
						2023-08-13 21:48:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						5d364e268f
					 | 
					
						
						
							
							fix: 支付/回调  修复ElDescriptions对齐问题
						
						
						
						
						
						
					 | 
					
						2023-08-13 21:38:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e954ae6010
					 | 
					
						
						
							
							支付:修复支付应用的 mock 展示不正确
						
						
						
						
						
						
					 | 
					
						2023-08-13 16:30:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						16369c001c
					 | 
					
						
						
							
							!197 同步商城实现
						
						
						
						
						
						
						
						Merge pull request !197 from 芋道源码/dev 
						
						
					 | 
					
						2023-08-13 03:03:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c3a8479eca
					 | 
					
						
						
							
							支付退款列表的 review
						
						
						
						
						
						
					 | 
					
						2023-08-13 11:02:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3f90ca3a57
					 | 
					
						
						
							
							!196 fix: 支付管理/退款订单 对标 vue2
						
						
						
						
						
						
						
						Merge pull request !196 from dhb52/master 
						
						
					 | 
					
						2023-08-13 02:55:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						10c121d62d
					 | 
					
						
						
							
							fix: 修复ElDescriptions对齐问题
						
						
						
						
						
						
					 | 
					
						2023-08-13 01:53:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						620a2009c3
					 | 
					
						
						
							
							fix: 支付管理/退款订单 对标 vue2
						
						
						
						
						
						
					 | 
					
						2023-08-13 01:26:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7bf3e41c61
					 | 
					
						
						
							
							商城:
						
						
						
						
						
						
						
						1. 微调砍价活动的代码 
						
						
					 | 
					
						2023-08-13 00:49:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						127e6b202e
					 | 
					
						
						
							
							商城:
						
						
						
						
						
						
						
						1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题 
						
						
					 | 
					
						2023-08-13 00:07:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ff8bde207d
					 | 
					
						
						
							
							商城:
						
						
						
						
						
						
						
						1. 修复秒杀活动,修改商品的秒杀价格,会存在 *100 的问题 
						
						
					 | 
					
						2023-08-12 16:25:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2ec50bab15
					 | 
					
						
						
							
							chore: remove qrcode.vue use qrcode
						
						
						
						
						
						
					 | 
					
						2023-08-12 12:23:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b9477463fd
					 | 
					
						
						
							
							fix: 提交后刷新列表
						
						
						
						
						
						
					 | 
					
						2023-08-12 12:23:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e262ab9504
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
						
						
						
						
						
						
					 | 
					
						2023-08-12 12:06:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9984de0dc7
					 | 
					
						
						
							
							商城:
						
						
						
						
						
						
						
						1. 调整优惠劵的目录
2. 简化秒杀时间配置 
						
						
					 | 
					
						2023-08-12 11:39:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						815897ca8b
					 | 
					
						
						
							
							商城:优惠劵的前端完善
						
						
						
						
						
						
					 | 
					
						2023-08-12 11:09:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						98477ef433
					 | 
					
						
						
							
							修复时间检索,value format 错误,导致无法搜索的问题
						
						
						
						
						
						
					 | 
					
						2023-08-12 10:13:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						90f22934da
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-08-12 09:43:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						19cad3b873
					 | 
					
						
						
							
							code review:补全支付文档
						
						
						
						
						
						
					 | 
					
						2023-08-11 09:22:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf66727009
					 | 
					
						
						
							
							code review:优化支付订单的实现
						
						
						
						
						
						
					 | 
					
						2023-08-11 08:59:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1ab7ea0640
					 | 
					
						
						
							
							code review:优化支付通知的实现
						
						
						
						
						
						
					 | 
					
						2023-08-11 07:58:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						26cf4ca64a
					 | 
					
						
						
							
							code review:优化示例订单的实现
						
						
						
						
						
						
					 | 
					
						2023-08-11 00:02:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7625e6757c
					 | 
					
						
						
							
							code review:优化收银台的实现,解决 TODO
						
						
						
						
						
						
					 | 
					
						2023-08-10 23:30:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						551ebbd41d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
						
						
						
						
						
						
						
						 Conflicts:
	src/utils/constants.ts 
						
						
					 | 
					
						2023-08-10 22:21:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b0e27b2201
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
						
						
						
						
						
						
					 | 
					
						2023-08-10 22:19:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |