| 
						
					 | 
					
						
						
						
						
							
						
						
							aebdb23b6d
							
						
					 | 
					
						
						
							
							Merge pull request '商品分类' (#386) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/386 
						
						
					 | 
					
						2020-09-22 09:14:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4c19871d8
							
						
					 | 
					
						
						
							
							商品分类
						
						
						
						
						
						
					 | 
					
						2020-09-22 09:13:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							977d38ce18
							
						
					 | 
					
						
						
							
							Merge pull request '增加订单平台已退款状态' (#385) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/385 
						
						
					 | 
					
						2020-09-21 17:03:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							194710f97b
							
						
					 | 
					
						
						
							
							增加订单平台已退款状态
						
						
						
						
						
						
					 | 
					
						2020-09-21 16:58:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c14a23d76
							
						
					 | 
					
						
						
							
							Merge pull request '增加订单平台已退款状态' (#384) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/384 
						
						
					 | 
					
						2020-09-21 16:43:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							611066e778
							
						
					 | 
					
						
						
							
							增加订单平台已退款状态
						
						
						
						
						
						
					 | 
					
						2020-09-21 16:42:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc1d0b8e4c
							
						
					 | 
					
						
						
							
							Merge pull request '增加订单平台已退款状态' (#383) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/383 
						
						
					 | 
					
						2020-09-21 15:51:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31027d10e4
							
						
					 | 
					
						
						
							
							增加订单平台已退款状态
						
						
						
						
						
						
					 | 
					
						2020-09-21 15:50:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c606b9b3ce
							
						
					 | 
					
						
						
							
							Merge pull request '修改字体大小' (#382) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/382 
						
						
					 | 
					
						2020-09-21 08:41:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							c85f1aeead
							
						
					 | 
					
						
						
							
							修改字体大小
						
						
						
						
						
						
					 | 
					
						2020-09-21 17:37:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf765ba231
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#381) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/381 
						
						
					 | 
					
						2020-09-19 20:02:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							645b3f65c1
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-19 20:01:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ded4488f89
							
						
					 | 
					
						
						
							
							Merge pull request '实体店送洗可不传图片' (#380) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/380 
						
						
					 | 
					
						2020-09-19 16:44:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b2667df2a
							
						
					 | 
					
						
						
							
							实体店送洗可不传图片
						
						
						
						
						
						
					 | 
					
						2020-09-19 16:43:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							79f0040688
							
						
					 | 
					
						
						
							
							Merge pull request '图标' (#379) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/379 
						
						
					 | 
					
						2020-09-18 16:41:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							00670f4501
							
						
					 | 
					
						
						
							
							图标
						
						
						
						
						
						
					 | 
					
						2020-09-18 16:40:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db20e52e48
							
						
					 | 
					
						
						
							
							Merge pull request '去掉首页下拉刷新' (#378) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/378 
						
						
					 | 
					
						2020-09-18 16:37:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5cf7ae2fb
							
						
					 | 
					
						
						
							
							去掉首页下拉刷新
						
						
						
						
						
						
					 | 
					
						2020-09-18 16:36:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7644def64f
							
						
					 | 
					
						
						
							
							Merge pull request '修改图标' (#377) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/377 
						
						
					 | 
					
						2020-09-18 10:16:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2add59f416
							
						
					 | 
					
						
						
							
							修改图标
						
						
						
						
						
						
					 | 
					
						2020-09-18 10:15:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							689b6a03aa
							
						
					 | 
					
						
						
							
							Merge pull request '修改了备注的高度' (#376) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/376 
						
						
					 | 
					
						2020-09-17 19:44:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2f8557eb42
							
						
					 | 
					
						
						
							
							修改了备注的高度
						
						
						
						
						
						
					 | 
					
						2020-09-17 19:42:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6364be1743
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#374) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/374 
						
						
					 | 
					
						2020-09-17 19:33:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c893ece3a4
							
						
					 | 
					
						
						
							
							退款
						
						
						
						
						
						
					 | 
					
						2020-09-17 19:33:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fa9817e7bb
							
						
					 | 
					
						
						
							
							退款
						
						
						
						
						
						
					 | 
					
						2020-09-17 18:48:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a60f61c300
							
						
					 | 
					
						
						
							
							Merge pull request '添加了请求接口' (#373) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/373 
						
						
					 | 
					
						2020-09-16 19:06:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							6e40ae0daa
							
						
					 | 
					
						
						
							
							添加了请求接口
						
						
						
						
						
						
					 | 
					
						2020-09-16 18:35:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e96fcf28a9
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#371) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/371 
						
						
					 | 
					
						2020-09-16 17:07:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8af938e0eb
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-16 11:31:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d805b6f0bf
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#370) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/370 
						
						
					 | 
					
						2020-09-15 17:40:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							10c9498985
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-15 16:44:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75dd6ca8d8
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#369) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/369 
						
						
					 | 
					
						2020-09-15 16:16:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06bc5651ae
							
						
					 | 
					
						
						
							
							达人申请添加身份证
						
						
						
						
						
						
					 | 
					
						2020-09-15 16:14:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							28c324e449
							
						
					 | 
					
						
						
							
							达人申请添加身份证
						
						
						
						
						
						
					 | 
					
						2020-09-15 16:07:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8158a1e780
							
						
					 | 
					
						
						
							
							Merge pull request '达人申请添加身份证' (#368) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/368 
						
						
					 | 
					
						2020-09-15 15:41:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							339f8e3346
							
						
					 | 
					
						
						
							
							达人申请添加身份证
						
						
						
						
						
						
					 | 
					
						2020-09-15 15:40:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a9f06e722
							
						
					 | 
					
						
						
							
							Merge pull request '修改' (#367) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/367 
						
						
					 | 
					
						2020-09-11 20:16:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							7a9c0eb53f
							
						
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2020-09-11 20:15:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd15356717
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#366) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/366 
						
						
					 | 
					
						2020-09-11 19:48:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							414f50ce5d
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-11 18:47:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5ba314bf6
							
						
					 | 
					
						
						
							
							Merge pull request '修改了标题' (#365) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/365 
						
						
					 | 
					
						2020-09-11 17:59:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ad5ed4040c
							
						
					 | 
					
						
						
							
							修改了标题
						
						
						
						
						
						
					 | 
					
						2020-09-11 17:59:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f076c03c99
							
						
					 | 
					
						
						
							
							Merge pull request '添加了进入提醒' (#364) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/364 
						
						
					 | 
					
						2020-09-11 17:01:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							d5f9055445
							
						
					 | 
					
						
						
							
							添加了进入提醒
						
						
						
						
						
						
					 | 
					
						2020-09-11 17:00:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab4c80ae36
							
						
					 | 
					
						
						
							
							Merge pull request '修改美甲' (#363) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/363 
						
						
					 | 
					
						2020-09-11 14:46:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							28832c38ae
							
						
					 | 
					
						
						
							
							修改美甲
						
						
						
						
						
						
					 | 
					
						2020-09-11 14:45:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b95f009ff3
							
						
					 | 
					
						
						
							
							Merge pull request '详情显示备注' (#362) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/362 
						
						
					 | 
					
						2020-09-11 11:41:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5616cd046f
							
						
					 | 
					
						
						
							
							详情显示备注
						
						
						
						
						
						
					 | 
					
						2020-09-11 11:40:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3fd6e953c6
							
						
					 | 
					
						
						
							
							Merge pull request '订单添加备注' (#361) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/361 
						
						
					 | 
					
						2020-09-11 11:26:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eedb40b9d0
							
						
					 | 
					
						
						
							
							订单添加备注
						
						
						
						
						
						
					 | 
					
						2020-09-11 11:24:05 +08:00 | 
					
					
						
						
							
							
							
						
					 |