lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							177cd86366
							
						
					 | 
					
						
						
							
							支持添加重复名称的商品分类
						
						
						
						
						
						
					 | 
					
						2021-07-05 11:14:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d06b5ceb89
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-05 09:25:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							6926cd583d
							
						
					 | 
					
						
						
							
							商品索引生成是,对索引值的非空处理
						
						
						
						
						
						
					 | 
					
						2021-07-05 09:25:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							de2777e244
							
						
					 | 
					
						
						
							
							商品索引包含sku信息问题处理
						
						
						
						
						
						
					 | 
					
						2021-07-05 09:22:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c10b698aed
							
						
					 | 
					
						
						
							
							支持文章传图
						
						
						
						
						
						
					 | 
					
						2021-07-03 13:40:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							256d9e240e
							
						
					 | 
					
						
						
							
							商品参数返回vo处理
						
						
						
						
						
						
					 | 
					
						2021-07-02 15:05:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9662bd61a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into qiuqiu
						
						
						
						
						
						
					 | 
					
						2021-07-01 18:42:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							eedea676aa
							
						
					 | 
					
						
						
							
							商品详情展示参数
						
						
						
						
						
						
					 | 
					
						2021-07-01 17:06:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							92c3c21e32
							
						
					 | 
					
						
						
							
							商品删除,删除分销商品
						
						
						
						
						
						
					 | 
					
						2021-07-01 14:31:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd13a9b150
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-07-01 11:19:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							931276f72b
							
						
					 | 
					
						
						
							
							添加ResultCode
						
						
						
						
						
						
					 | 
					
						2021-07-01 11:17:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							e38f9aa2ff
							
						
					 | 
					
						
						
							
							!13 fix https://gitee.com/beijing_hongye_huicheng/lilishop/issues/I3YFU4
						
						
						
						
						
						
						
						Merge pull request !13 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-07-01 02:16:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							696e075fcd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-07-01 10:12:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d25ba76094
							
						
					 | 
					
						
						
							
							fix https://gitee.com/beijing_hongye_huicheng/lilishop/issues/I3YFU4
						
						
						
						
						
						
					 | 
					
						2021-07-01 10:12:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							cce14b4794
							
						
					 | 
					
						
						
							
							同步
						
						
						
						
						
						
					 | 
					
						2021-07-01 08:35:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6706d6394
							
						
					 | 
					
						
						
							
							1.使用hutool进行Object to Int格式转换
						
						
						
						
						
						
						
						2.添加部分resultCode 
						
						
					 | 
					
						2021-07-01 08:33:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e3a9eb904
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-06-30 19:59:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							079437100d
							
						
					 | 
					
						
						
							
							版本好升级
						
						
						
						
						
						
					 | 
					
						2021-06-30 19:59:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7ce709ce6
							
						
					 | 
					
						
						
							
							使用hutool进行格式转换
						
						
						
						
						
						
					 | 
					
						2021-06-30 16:29:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							cff2b95c48
							
						
					 | 
					
						
						
							
							同步
						
						
						
						
						
						
					 | 
					
						2021-06-30 15:47:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a77b3cec7
							
						
					 | 
					
						
						
							
							商品数据转换问题
						
						
						
						
						
						
					 | 
					
						2021-06-30 15:46:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							346465630c
							
						
					 | 
					
						
						
							
							添加ResultCode
						
						
						
						
						
						
					 | 
					
						2021-06-30 15:45:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							23388eff6b
							
						
					 | 
					
						
						
							
							升级项目版本号
						
						
						
						
						
						
					 | 
					
						2021-06-30 14:53:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							800437473d
							
						
					 | 
					
						
						
							
							1.分销员添加结算银行信息
						
						
						
						
						
						
						
						2.电话校验支持手机号 
						
						
					 | 
					
						2021-06-30 12:02:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							46f216c191
							
						
					 | 
					
						
						
							
							1.店铺关闭,批量下架店铺商品问题。
						
						
						
						
						
						
						
						2.解决实物/虚拟订单发货逻辑判断问题 
						
						
					 | 
					
						2021-06-30 10:26:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a60a535708
							
						
					 | 
					
						
						
							
							修改分销可提现金额
						
						
						
						
						
						
					 | 
					
						2021-06-30 08:41:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							888b5e2558
							
						
					 | 
					
						
						
							
							解决直播间时间不正确问题
						
						
						
						
						
						
					 | 
					
						2021-06-29 17:01:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							1431d990f9
							
						
					 | 
					
						
						
							
							解决直播间时间不正确问题
						
						
						
						
						
						
					 | 
					
						2021-06-29 16:58:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f509b8745d
							
						
					 | 
					
						
						
							
							token生成时权限过滤问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-29 16:43:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1b9f287c7
							
						
					 | 
					
						
						
							
							新增管理员即赋予权限无法生效问题处理。直播间未登录用户报错问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-29 16:26:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ee3e49d0b
							
						
					 | 
					
						
						
							
							用户在请求直播时没有登录抛出异常问题处理。
						
						
						
						
						
						
					 | 
					
						2021-06-29 15:40:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							05904b25c4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-06-29 11:56:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e54b2f179
							
						
					 | 
					
						
						
							
							规格值字段新增
						
						
						
						
						
						
					 | 
					
						2021-06-29 11:56:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6d045c663
							
						
					 | 
					
						
						
							
							同步
						
						
						
						
						
						
					 | 
					
						2021-06-29 11:29:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							50f96727b3
							
						
					 | 
					
						
						
							
							分销商品VO返回GoodsId
						
						
						
						
						
						
					 | 
					
						2021-06-29 11:24:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							39e851ee78
							
						
					 | 
					
						
						
							
							aop积分日志记录兼容问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-29 11:15:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a415ffc77
							
						
					 | 
					
						
						
							
							条件判定语句顺序调整
						
						
						
						
						
						
					 | 
					
						2021-06-29 10:25:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a9ba13fc0
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-06-29 10:13:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d96d5edcd5
							
						
					 | 
					
						
						
							
							会员提现api注解问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-29 10:13:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d35eb293dd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-06-29 09:23:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcfa140a0a
							
						
					 | 
					
						
						
							
							添加注释
						
						
						
						
						
						
					 | 
					
						2021-06-29 09:23:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							707c4dbec2
							
						
					 | 
					
						
						
							
							!12 会员消息问题整改
						
						
						
						
						
						
						
						Merge pull request !12 from chopper711/qiuqiu 
						
						
					 | 
					
						2021-06-29 01:05:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							13b1c353b9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into qiuqiu
						
						
						
						
						
						
					 | 
					
						2021-06-29 08:26:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ed54e061f
							
						
					 | 
					
						
						
							
							会员消息修改
						
						
						
						
						
						
					 | 
					
						2021-06-29 08:25:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5fab95707
							
						
					 | 
					
						
						
							
							1.优惠券活动由定时器修改为延时任务执行。
						
						
						
						
						
						
						
						2.修改shopEditDTO,不继承ShopDetail 
						
						
					 | 
					
						2021-06-28 18:18:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbf18b7b0a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-06-28 16:09:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe06555a0b
							
						
					 | 
					
						
						
							
							初始化30天的秒杀活动
						
						
						
						
						
						
					 | 
					
						2021-06-28 16:09:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf9e6a659a
							
						
					 | 
					
						
						
							
							qq联合登录openid问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-28 15:16:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c628c0ebb2
							
						
					 | 
					
						
						
							
							店铺入驻字段缺失问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-28 14:56:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							31479bab19
							
						
					 | 
					
						
						
							
							同步
						
						
						
						
						
						
					 | 
					
						2021-06-28 11:31:42 +08:00 | 
					
					
						
						
							
							
							
						
					 |