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
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ab2865f0d
							
						
					 | 
					
						
						
							
							购物车物流规则匹配问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-19 16:35:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							edfd75d31b
							
						
					 | 
					
						
						
							
							商品es问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-19 16:35:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a6ce0b22c
							
						
					 | 
					
						
						
							
							如果商品开启审核,并且商品设置为立即上架,则将商品的上架状态修改为已上架
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:47:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							48f24b675b
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:26:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a10110e1f0
							
						
					 | 
					
						
						
							
							调整异常机制
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:11:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b7be309b2
							
						
					 | 
					
						
						
							
							运营后台首页,展示的待审核商品数量不正确
						
						
						
						
						
						
					 | 
					
						2021-05-19 09:33:14 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							3925422b3e
							
						
					 | 
					
						
						
							
							批量发送短信任务
						
						
						
						
						
						
					 | 
					
						2021-05-18 17:27:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0528a1e1ca
							
						
					 | 
					
						
						
							
							错误消息机制问题重新处理
						
						
						
						
						
						
					 | 
					
						2021-05-18 15:40:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							09cb489dc9
							
						
					 | 
					
						
						
							
							修改买家端店铺申请参数
						
						
						
						
						
						
					 | 
					
						2021-05-18 15:21:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea203d69a4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-05-18 14:21:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9f02cfe94
							
						
					 | 
					
						
						
							
							商品索引初始化没办法根据属性查询问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-18 14:19:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							48293299e0
							
						
					 | 
					
						
						
							
							调整移动端效果展示图尺寸
						
						
						
						
						
						
					 | 
					
						2021-05-18 10:22:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							90d03a05a2
							
						
					 | 
					
						
						
							
							增加店铺入驻文章类型。添加修改文章状态方法
						
						
						
						
						
						
					 | 
					
						2021-05-18 08:57:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c3a1928ff
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-05-18 08:17:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1924b609c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:19:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							f824164139
							
						
					 | 
					
						
						
							
							开启短信功能
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:19:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f63d5a164
							
						
					 | 
					
						
						
							
							调整店铺与会员关系问题
						
						
						
						
						
						
					 | 
					
						2021-05-17 17:21:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							910b665d8a
							
						
					 | 
					
						
						
							
							微信小程序直播V0.2
						
						
						
						
						
						
					 | 
					
						2021-05-17 17:03:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a7d5b62b1
							
						
					 | 
					
						
						
							
							会员是否有店铺字段处理
						
						
						
						
						
						
					 | 
					
						2021-05-17 16:36:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c049552fc7
							
						
					 | 
					
						
						
							
							去除冗余代码
						
						
						
						
						
						
					 | 
					
						2021-05-17 12:55:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0f46a78a6
							
						
					 | 
					
						
						
							
							微信小程序直播间创建、微信小程序直播商品添加、删除、查询状态
						
						
						
						
						
						
					 | 
					
						2021-05-17 12:00:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cea9038eb
							
						
					 | 
					
						
						
							
							增加注释
						
						
						
						
						
						
					 | 
					
						2021-05-17 10:42:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							591ce04e42
							
						
					 | 
					
						
						
							
							会员经验值设置
						
						
						
						
						
						
					 | 
					
						2021-05-17 09:24:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8a43573fd
							
						
					 | 
					
						
						
							
							会员积分设置,会员下单赠送积分(非积分订单),订单售后扣除积分
						
						
						
						
						
						
					 | 
					
						2021-05-17 09:04:10 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							839902e770
							
						
					 | 
					
						
						
							
							会员查询状态问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-14 16:12:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8afaffbf1f
							
						
					 | 
					
						
						
							
							无效引用代码删除
						
						
						
						
						
						
					 | 
					
						2021-05-14 15:36:48 +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 | 
					
					
						
						
							
							
							
						
					 |