puhui999
							
						 
					 | 
					
						
						
							
						
						c445173855
					 | 
					
						
						
							
							拼团记录:接口对接
						
						
						
						
						
						
					 | 
					
						2023-10-06 22:20:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						eee3d0fef5
					 | 
					
						
						
							
							拼团记录: 完成 UI 部分
						
						
						
						
						
						
					 | 
					
						2023-10-06 18:40:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						869bac2501
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev' into dev-to-dev
						
						
						
						
						
						
					 | 
					
						2023-10-05 21:50:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cf7ac2cb10
					 | 
					
						
						
							
							promotion:新增记录记录列表
						
						
						
						
						
						
					 | 
					
						2023-10-05 12:42:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						860872a890
					 | 
					
						
						
							
							promotion:新增砍价记录列表
						
						
						
						
						
						
					 | 
					
						2023-10-05 12:06:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						42f0bf07f0
					 | 
					
						
						
							
							promotion:优化砍价活动的管理
						
						
						
						
						
						
					 | 
					
						2023-10-05 02:17:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4c2eb3d8b2
					 | 
					
						
						
							
							!262 核销
						
						
						
						
						
						
						
						Merge pull request !262 from 疯狂的世界/dev 
						
						
					 | 
					
						2023-10-04 09:34:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						58b6b1ba57
					 | 
					
						
						
							
							交易:核销
						
						
						
						
						
						
					 | 
					
						2023-10-04 10:51:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7c491ff62a
					 | 
					
						
						
							
							promotion:优化秒杀活动的界面
						
						
						
						
						
						
					 | 
					
						2023-10-03 18:41:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						40f44fc78e
					 | 
					
						
						
							
							promotion:优化优惠劵的界面
						
						
						
						
						
						
					 | 
					
						2023-10-03 13:01:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						59ab6218ca
					 | 
					
						
						
							
							trade:优化分销界面的 width 列宽度,和一些非空判断
						
						
						
						
						
						
					 | 
					
						2023-10-03 12:16:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e6ee0ab445
					 | 
					
						
						
							
							!261 对齐面包屑的图标和文字
						
						
						
						
						
						
						
						Merge pull request !261 from 疯狂的世界/dev 
						
						
					 | 
					
						2023-10-02 16:00:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						6515e218e2
					 | 
					
						
						
							
							Merge branch 'dev' into dev_local
						
						
						
						
						
						
					 | 
					
						2023-10-02 23:58:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						a06a63c1be
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-10-02 23:52:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ab95d87c68
					 | 
					
						
						
							
							trade:优化门店的 list 列表,新增是否自提的配置项
						
						
						
						
						
						
					 | 
					
						2023-10-02 21:18:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a9bbbc7b0a
					 | 
					
						
						
							
							trade:优化运费模版的实现
						
						
						
						
						
						
					 | 
					
						2023-10-02 18:30:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb08f6f54f
					 | 
					
						
						
							
							trade:完善退款详情
						
						
						
						
						
						
					 | 
					
						2023-10-02 15:44:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						df8a3941c1
					 | 
					
						
						
							
							对齐面包屑的图标和文字
						
						
						
						
						
						
					 | 
					
						2023-10-02 11:11:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4c077711a1
					 | 
					
						
						
							
							对齐面包屑的图标和文字
						
						
						
						
						
						
					 | 
					
						2023-10-02 11:03:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4fddbccea1
					 | 
					
						
						
							
							trade:完善订单详情
						
						
						
						
						
						
					 | 
					
						2023-10-02 10:34:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						588ce1c9ae
					 | 
					
						
						
							
							trade:微调 order 列表界面
						
						
						
						
						
						
					 | 
					
						2023-10-01 23:44:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a5808c9e9c
					 | 
					
						
						
							
							!259 Review代码修改
						
						
						
						
						
						
						
						Merge pull request !259 from 疯狂的世界/dev 
						
						
					 | 
					
						2023-10-01 13:57:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						17c31978f7
					 | 
					
						
						
							
							product:优化商品评论
						
						
						
						
						
						
					 | 
					
						2023-10-01 21:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8b7543acd5
					 | 
					
						
						
							
							product:优化属性列表
						
						
						
						
						
						
					 | 
					
						2023-10-01 21:11:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5f80d1611c
					 | 
					
						
						
							
							product:优化分类列表
						
						
						
						
						
						
					 | 
					
						2023-10-01 20:55:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						88677ee121
					 | 
					
						
						
							
							product:优化商品发布页
						
						
						
						
						
						
					 | 
					
						2023-10-01 20:16:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3a9668d632
					 | 
					
						
						
							
							product:优化商品列表的样式、实现代码
						
						
						
						
						
						
					 | 
					
						2023-10-01 19:44:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						3a96812d47
					 | 
					
						
						
							
							会员:会员配置的积分相关字段加上point前缀
						
						
						
						
						
						
					 | 
					
						2023-10-01 10:41:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						3ab1ed707f
					 | 
					
						
						
							
							会员:积分配置改为会员配置
						
						
						
						
						
						
					 | 
					
						2023-10-01 10:25:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						0066d79876
					 | 
					
						
						
							
							签到:签到后增加用户积分、经验
						
						
						
						
						
						
					 | 
					
						2023-10-01 09:53:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						6508d841f5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-09-30 22:08:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						4b7e57e67d
					 | 
					
						
						
							
							会员详情,修改会员积分
						
						
						
						
						
						
					 | 
					
						2023-09-30 15:50:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						940a102546
					 | 
					
						
						
							
							会员:会员详情-推广用户列表
						
						
						
						
						
						
					 | 
					
						2023-09-30 14:10:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						b48f19c646
					 | 
					
						
						
							
							会员:会员详情-优惠券列表
						
						
						
						
						
						
					 | 
					
						2023-09-30 13:55:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						675f3df5cb
					 | 
					
						
						
							
							会员详情,查询钱包信息
						
						
						
						
						
						
					 | 
					
						2023-09-30 12:40:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						654094b4fd
					 | 
					
						
						
							
							!258 交易统计
						
						
						
						
						
						
						
						Merge pull request !258 from 疯狂的世界/dev 
						
						
					 | 
					
						2023-09-30 03:24:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						6475f81534
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-09-29 21:08:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						c322fb3d0d
					 | 
					
						
						
							
							统计:交易统计
						
						
						
						
						
						
					 | 
					
						2023-09-29 21:08:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						150c77cff0
					 | 
					
						
						
							
							fix eslint problems
						
						
						
						
						
						
					 | 
					
						2023-09-29 16:25:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fb94ae9674
					 | 
					
						
						
							
							trade:退款理由的维护
						
						
						
						
						
						
					 | 
					
						2023-09-29 13:35:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						04e02ffbd2
					 | 
					
						
						
							
							trade:分佣界面的微调
						
						
						
						
						
						
					 | 
					
						2023-09-28 16:38:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						74de8e9687
					 | 
					
						
						
							
							trade:优化交易配置的参数校验
						
						
						
						
						
						
					 | 
					
						2023-09-28 15:29:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2f82eff526
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-09-27 23:30:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						888c1371c6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2023-09-27 23:30:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c6031ba2b2
					 | 
					
						
						
							
							增加 user detail 的 todo
						
						
						
						
						
						
					 | 
					
						2023-09-27 23:30:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						65047b93a4
					 | 
					
						
						
							
							!250 【工作流】委派
						
						
						
						
						
						
						
						Merge pull request !250 from Youkehai/feature/bpm-delegate 
						
						
					 | 
					
						2023-09-25 12:10:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								youkehai
							
						 
					 | 
					
						
						
							
						
						0fba0d9a6a
					 | 
					
						
						
							
							feat: 对齐后端-工作流委派的参数
						
						
						
						
						
						
					 | 
					
						2023-09-25 11:31:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								youkehai
							
						 
					 | 
					
						
						
							
						
						2aeba127b6
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue 
						
						
					 | 
					
						2023-09-25 09:37:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b9881f2941
					 | 
					
						
						
							
							!252 分销:Review代码修改
						
						
						
						
						
						
						
						Merge pull request !252 from 疯狂的世界/brokerage 
						
						
					 | 
					
						2023-09-25 00:37:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						99a0c7c3e7
					 | 
					
						
						
							
							1.8.2 版本发布
						
						
						
						
						
						
					 | 
					
						2023-09-24 23:45:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |