lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b70da68761
							
						
					 | 
					
						
						
							
							Merge branch 'Bulbasaur' of https://gitee.com/beijing_hongye_huicheng/lilishop into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-06-01 15:51:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							0324951d9a
							
						
					 | 
					
						
						
							
							微信小程序优化
						
						
						
						
						
						
					 | 
					
						2021-06-01 15:51:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							78aee87b45
							
						
					 | 
					
						
						
							
							Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-31 11:34:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e09747c410
							
						
					 | 
					
						
						
							
							支持elk
						
						
						
						
						
						
					 | 
					
						2021-05-31 11:34:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							814d118d77
							
						
					 | 
					
						
						
							
							运营后台可设置推荐直播间
						
						
						
						
						
						
					 | 
					
						2021-05-28 12:10:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b855cfb5f8
							
						
					 | 
					
						
						
							
							积分商品店铺名称问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-26 09:27:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9ccc4a7b7
							
						
					 | 
					
						
						
							
							添加秒杀活动设置
						
						
						
						
						
						
					 | 
					
						2021-05-25 08:29:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7e29da455
							
						
					 | 
					
						
						
							
							秒杀活动增加活动商品数量
						
						
						
						
						
						
					 | 
					
						2021-05-25 08:02:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							16cc989cdf
							
						
					 | 
					
						
						
							
							设置秒杀活动为自动开启
						
						
						
						
						
						
					 | 
					
						2021-05-24 18:18:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							777226dc95
							
						
					 | 
					
						
						
							
							优惠券活动发送/触发
						
						
						
						
						
						
					 | 
					
						2021-05-24 11:09:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							8924981556
							
						
					 | 
					
						
						
							
							创建优惠券活动
						
						
						
						
						
						
					 | 
					
						2021-05-21 19:54:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							16498a6850
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-21 17:25:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae69d8a11b
							
						
					 | 
					
						
						
							
							检测APP版本是否可以添加
						
						
						
						
						
						
					 | 
					
						2021-05-21 17:24:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c200595a5
							
						
					 | 
					
						
						
							
							设置 app版本白名单
						
						
						
						
						
						
					 | 
					
						2021-05-21 14:18:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b1205c3d3
							
						
					 | 
					
						
						
							
							APP版本升级
						
						
						
						
						
						
					 | 
					
						2021-05-21 11:59:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a15d5d7c36
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-20 16:42:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e73d189022
							
						
					 | 
					
						
						
							
							解决分销绑定问题
						
						
						
						
						
						
					 | 
					
						2021-05-20 16:20:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b427daab02
							
						
					 | 
					
						
						
							
							添加平台审核售后单功能
						
						
						
						
						
						
					 | 
					
						2021-05-20 15:38:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							273d0abbc7
							
						
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2021-05-19 19:38:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							250fffab77
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-05-19 19:29:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							120189ef99
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-05-19 19:13:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							64c095f20e
							
						
					 | 
					
						
						
							
							分销订单
						
						
						
						
						
						
					 | 
					
						2021-05-19 19:11:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							97defc8a12
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java 
						
						
					 | 
					
						2021-05-19 16:36:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a10110e1f0
							
						
					 | 
					
						
						
							
							调整异常机制
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:11:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d156f01e6
							
						
					 | 
					
						
						
							
							会员积分历史
						
						
						
						
						
						
					 | 
					
						2021-05-19 09:07:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							37a6455e56
							
						
					 | 
					
						
						
							
							会员积分历史
						
						
						
						
						
						
					 | 
					
						2021-05-19 09:05:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							02827a2f8b
							
						
					 | 
					
						
						
							
							微信小程序直播V0.2
						
						
						
						
						
						
					 | 
					
						2021-05-18 23:34:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							0173ba814e
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-18 17:35:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0528a1e1ca
							
						
					 | 
					
						
						
							
							错误消息机制问题重新处理
						
						
						
						
						
						
					 | 
					
						2021-05-18 15:40:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							90d03a05a2
							
						
					 | 
					
						
						
							
							增加店铺入驻文章类型。添加修改文章状态方法
						
						
						
						
						
						
					 | 
					
						2021-05-18 08:57:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c3a1928ff
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-05-18 08:17:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cea9038eb
							
						
					 | 
					
						
						
							
							增加注释
						
						
						
						
						
						
					 | 
					
						2021-05-17 10:42:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							591ce04e42
							
						
					 | 
					
						
						
							
							会员经验值设置
						
						
						
						
						
						
					 | 
					
						2021-05-17 09:24:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fae7ac565
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-17 08:18:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							57d65f3fd9
							
						
					 | 
					
						
						
							
							会员等级V0.1
						
						
						
						
						
						
					 | 
					
						2021-05-16 23:41:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bffca15b3c
							
						
					 | 
					
						
						
							
							后台商品筛选上下架问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-14 17:56:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6b2b955e8
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Bulbasaur
						
						
						
						
						
						
					 | 
					
						2021-05-13 15:07:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a10c38f3c1
							
						
					 | 
					
						
						
							
							去除final使用@Autowired
						
						
						
						
						
						
					 | 
					
						2021-05-13 15:07:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							453b4426d8
							
						
					 | 
					
						
						
							
							代码缺陷问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-13 15:03:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3785bdb3bb
							
						
					 | 
					
						
						
							
							commit message
						
						
						
						
						
						
					 | 
					
						2021-05-13 10:41:46 +08:00 | 
					
					
						
						
							
							
							
						
					 |