pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee5b4515a
							
						
					 | 
					
						
						
							
							修改积分参数命名规范
						
						
						
						
						
						
					 | 
					
						2021-07-13 19:55:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							2246b498d9
							
						
					 | 
					
						
						
							
							解决如果是扣减积分 积分变化错误
						
						
						
						
						
						
					 | 
					
						2021-07-13 19:43:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							93e4998b87
							
						
					 | 
					
						
						
							
							修改积分类型字段类型
						
						
						
						
						
						
					 | 
					
						2021-07-13 18:48:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							4718ce292d
							
						
					 | 
					
						
						
							
							修改砍价活动
						
						
						
						
						
						
					 | 
					
						2021-07-13 16:17:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0ca366431
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-13 10:28:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d3be0b283
							
						
					 | 
					
						
						
							
							查看店铺经营范围
						
						
						
						
						
						
					 | 
					
						2021-07-13 10:28:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							656e2a9307
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2021-07-12 23:41:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f08124afc
							
						
					 | 
					
						
						
							
							砍价活动第一版本
						
						
						
						
						
						
					 | 
					
						2021-07-12 23:38:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							86f010b87e
							
						
					 | 
					
						
						
							
							maven 规范
						
						
						
						
						
						
					 | 
					
						2021-07-12 16:33:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d29d166ce0
							
						
					 | 
					
						
						
							
							banner 统一
						
						
						
						
						
						
					 | 
					
						2021-07-12 14:44:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6a5630021
							
						
					 | 
					
						
						
							
							获取用户问题处理
						
						
						
						
						
						
					 | 
					
						2021-07-12 12:30:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8302ca2e3a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-09 14:46:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							17b977ef94
							
						
					 | 
					
						
						
							
							对索引生成判定进行处理
						
						
						
						
						
						
					 | 
					
						2021-07-09 14:46:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							512a298cc9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-09 11:56:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							86625e9e9d
							
						
					 | 
					
						
						
							
							增加订单申请售后失效、订单投诉申请失效天数。
						
						
						
						
						
						
					 | 
					
						2021-07-09 11:55:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a599fb9d01
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						# Conflicts:
#	framework/src/main/java/cn/lili/common/security/context/UserContext.java
#	framework/src/main/java/cn/lili/common/security/context/UserContextInit.java 
						
						
					 | 
					
						2021-07-09 11:17:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							89b057dfca
							
						
					 | 
					
						
						
							
							去除无效代码,规范代码
						
						
						
						
						
						
					 | 
					
						2021-07-09 11:16:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							18d2379a19
							
						
					 | 
					
						
						
							
							采用阿里代码规约,对代码进行优化
						
						
						
						
						
						
					 | 
					
						2021-07-09 08:42:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e73257922
							
						
					 | 
					
						
						
							
							采用阿里代码规约,对代码进行优化
						
						
						
						
						
						
					 | 
					
						2021-07-09 01:56:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e240f22b6
							
						
					 | 
					
						
						
							
							解决售后单列表的排序问题
						
						
						
						
						
						
					 | 
					
						2021-07-08 09:59:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							6aadd00e45
							
						
					 | 
					
						
						
							
							优惠券按照添加时间进行排序
						
						
						
						
						
						
					 | 
					
						2021-07-08 09:35:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fc962b29d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-07 16:18:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							00e93c91f5
							
						
					 | 
					
						
						
							
							优化订单商品类型
						
						
						
						
						
						
					 | 
					
						2021-07-07 16:17:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e7a4ee06c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into qiuqiu
						
						
						
						
						
						
					 | 
					
						2021-07-06 18:36:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							531ca13555
							
						
					 | 
					
						
						
							
							砍价商品
						
						
						
						
						
						
					 | 
					
						2021-07-06 18:35:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a903160305
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-06 14:53:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd2942a96b
							
						
					 | 
					
						
						
							
							mq单向消息报错问题,先做还原处理
						
						
						
						
						
						
					 | 
					
						2021-07-06 14:53:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							6235faba96
							
						
					 | 
					
						
						
							
							优化颠婆分类
						
						
						
						
						
						
					 | 
					
						2021-07-06 10:43:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e7254e765
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-06 10:12:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							e338229902
							
						
					 | 
					
						
						
							
							优化秒杀初始化方法
						
						
						
						
						
						
					 | 
					
						2021-07-06 10:12:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ff40291ee
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-07-05 16:42:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c8375e861
							
						
					 | 
					
						
						
							
							足迹记录mq时,单向发送,不等待mq响应
						
						
						
						
						
						
					 | 
					
						2021-07-05 16:41:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							acc40dc6fc
							
						
					 | 
					
						
						
							
							店铺配送不展示已经禁用的物流公司
						
						
						
						
						
						
					 | 
					
						2021-07-05 15:45:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							177cd86366
							
						
					 | 
					
						
						
							
							支持添加重复名称的商品分类
						
						
						
						
						
						
					 | 
					
						2021-07-05 11:14:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							6926cd583d
							
						
					 | 
					
						
						
							
							商品索引生成是,对索引值的非空处理
						
						
						
						
						
						
					 | 
					
						2021-07-05 09:25:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							de2777e244
							
						
					 | 
					
						
						
							
							商品索引包含sku信息问题处理
						
						
						
						
						
						
					 | 
					
						2021-07-05 09:22:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							256d9e240e
							
						
					 | 
					
						
						
							
							商品参数返回vo处理
						
						
						
						
						
						
					 | 
					
						2021-07-02 15:05:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |