paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							805197c127
							
						
					 | 
					
						
						
							
							增加订单查询参数(按照评论状态)
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:27:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							aca627e137
							
						
					 | 
					
						
						
							
							!57 增加订单查询参数(按照评论状态)
						
						
						
						
						
						
						
						Merge pull request !57 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-16 09:55:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b6a650ba4
							
						
					 | 
					
						
						
							
							增加订单查询参数(按照评论状态)
						
						
						
						
						
						
					 | 
					
						2021-11-16 17:54:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d43279b49
							
						
					 | 
					
						
						
							
							!56 修复获取售后信息无权限问题,修复xss忽略过滤转义问题
						
						
						
						
						
						
						
						Merge pull request !56 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-16 09:00:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a843081663
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
						
						# Conflicts:
#	framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java 
						
						
					 | 
					
						2021-11-16 16:58:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2765dd8fd9
							
						
					 | 
					
						
						
							
							修复获取售后信息无权限问题,修复xss忽略过滤转义问题
						
						
						
						
						
						
					 | 
					
						2021-11-16 16:55:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e7c703dfd
							
						
					 | 
					
						
						
							
							xss 过滤放掉邮箱
						
						
						
						
						
						
					 | 
					
						2021-11-16 15:58:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9112c4b39
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-16 15:27:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							1707563118
							
						
					 | 
					
						
						
							
							VO增加注册时间字段
						
						
						
						
						
						
					 | 
					
						2021-11-16 15:27:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							803bd32f4b
							
						
					 | 
					
						
						
							
							增加店铺字符串'null'处理
						
						
						
						
						
						
					 | 
					
						2021-11-15 18:21:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							31728300e1
							
						
					 | 
					
						
						
							
							规范参数命名
						
						
						
						
						
						
					 | 
					
						2021-11-14 15:42:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d317998af
							
						
					 | 
					
						
						
							
							增加说明
						
						
						
						
						
						
					 | 
					
						2021-11-14 15:41:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							078af06b63
							
						
					 | 
					
						
						
							
							增加过滤筛选项
						
						
						
						
						
						
					 | 
					
						2021-11-14 15:39:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							155d98e8b9
							
						
					 | 
					
						
						
							
							忽略加密参数xss,增加微信调试信息
						
						
						
						
						
						
					 | 
					
						2021-11-14 15:33:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c6d6e67bd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-14 14:17:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							4dc5950191
							
						
					 | 
					
						
						
							
							尝试解决无法base64解析错误
						
						
						
						
						
						
					 | 
					
						2021-11-14 14:17:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bulbasaur
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b3935339e
							
						
					 | 
					
						
						
							
							!55 修复编辑店铺报错电子邮箱报错
						
						
						
						
						
						
						
						Merge pull request !55 from Bulbasaur/feature/pg 
						
						
					 | 
					
						2021-11-12 10:17:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e218738fda
							
						
					 | 
					
						
						
							
							修复编辑店铺报错电子邮箱报错
						
						
						
						
						
						
					 | 
					
						2021-11-12 18:13:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bulbasaur
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc4c529c2c
							
						
					 | 
					
						
						
							
							!54 去除部分脱敏
						
						
						
						
						
						
						
						Merge pull request !54 from Bulbasaur/feature/pg 
						
						
					 | 
					
						2021-11-12 09:56:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							617cf98bc0
							
						
					 | 
					
						
						
							
							去除部分脱敏
						
						
						
						
						
						
					 | 
					
						2021-11-12 17:54:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7aa2c05d92
							
						
					 | 
					
						
						
							
							格式化忽略文件,去除无效文件夹
						
						
						
						
						
						
					 | 
					
						2021-11-12 13:22:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							505f3fcf96
							
						
					 | 
					
						
						
							
							增加xxl-job说明
						
						
						
						
						
						
					 | 
					
						2021-11-12 13:19:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							920d095fda
							
						
					 | 
					
						
						
							
							调整描述文字
						
						
						
						
						
						
					 | 
					
						2021-11-12 13:07:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bulbasaur
							
						 
					 | 
					
						
						
						
						
							
						
						
							2369b61243
							
						
					 | 
					
						
						
							
							!53  修复安全漏洞。优化代码
						
						
						
						
						
						
						
						Merge pull request !53 from Bulbasaur/feature/pg 
						
						
					 | 
					
						2021-11-11 10:21:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							89420f5c1e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
						
						# Conflicts:
#	buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java 
						
						
					 | 
					
						2021-11-11 18:18:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f13218564
							
						
					 | 
					
						
						
							
							修复安全漏洞。优化代码
						
						
						
						
						
						
					 | 
					
						2021-11-11 18:15:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cd0c9a205
							
						
					 | 
					
						
						
							
							update README.md.
						
						
						
						
						
						
					 | 
					
						2021-11-10 09:57:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bulbasaur
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fbdfb293a
							
						
					 | 
					
						
						
							
							!52 优化商品参数修改代码
						
						
						
						
						
						
						
						Merge pull request !52 from Bulbasaur/feature/pg 
						
						
					 | 
					
						2021-11-10 06:30:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fd75c65e1
							
						
					 | 
					
						
						
							
							优化商品参数
						
						
						
						
						
						
					 | 
					
						2021-11-10 14:15:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fda721bd4
							
						
					 | 
					
						
						
							
							!51 修复PayKit使用字符编码报错问题
						
						
						
						
						
						
						
						Merge pull request !51 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-09 09:23:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8854a97547
							
						
					 | 
					
						
						
							
							修复PayKit使用字符编码报错问题
						
						
						
						
						
						
					 | 
					
						2021-11-09 17:22:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1d84a7130
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-09 15:17:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ff0f266d4
							
						
					 | 
					
						
						
							
							会员收货地址管理类位置规范
						
						
						
						
						
						
					 | 
					
						2021-11-09 15:17:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							93d9b217ca
							
						
					 | 
					
						
						
							
							!50 修复PayKit使用字符编码报错问题
						
						
						
						
						
						
						
						Merge pull request !50 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-09 01:48:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							725e65cffb
							
						
					 | 
					
						
						
							
							修复PayKit使用字符编码报错问题
						
						
						
						
						
						
					 | 
					
						2021-11-09 09:45:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dd61f47fc
							
						
					 | 
					
						
						
							
							!49 优化商品搜索(增加商品基础分数,同goodsId递减。增加销量分数占比)
						
						
						
						
						
						
						
						Merge pull request !49 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-08 08:27:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							05eee7fca5
							
						
					 | 
					
						
						
							
							优化商品搜索(增加商品基础分数,同goodsId递减。增加销量分数占比)
						
						
						
						
						
						
					 | 
					
						2021-11-08 16:24:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ae97b71dd
							
						
					 | 
					
						
						
							
							优化商品搜索(增加商品基础分数,同goodsId递减。增加销量分数占比)
						
						
						
						
						
						
					 | 
					
						2021-11-08 16:23:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dbc340e6d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-11-08 16:21:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d877a24dec
							
						
					 | 
					
						
						
							
							优化商品搜索(增加商品基础分数,同goodsId递减。增加销量分数占比)
						
						
						
						
						
						
					 | 
					
						2021-11-08 16:20:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4feaa1546
							
						
					 | 
					
						
						
							
							优化商品搜索(增加商品基础分数,同goodsId递减。增加销量分数占比)
						
						
						
						
						
						
					 | 
					
						2021-11-08 16:18:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5eded10d19
							
						
					 | 
					
						
						
							
							代码对价格处理可能存在跨店铺计算问题处理
						
						
						
						
						
						
					 | 
					
						2021-11-08 11:21:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							65f6cf3b54
							
						
					 | 
					
						
						
							
							在线人数代码更优雅,去除繁琐的判定和无效的代码
						
						
						
						
						
						
					 | 
					
						2021-11-08 10:45:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f216957cb4
							
						
					 | 
					
						
						
							
							代码格式化规范
						
						
						
						
						
						
					 | 
					
						2021-11-08 10:36:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ba0212f37
							
						
					 | 
					
						
						
							
							自动删除优惠券存在时间类型问题,修正这个问题
						
						
						
						
						
						
					 | 
					
						2021-11-08 10:35:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8982db255d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-05 17:50:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0f343aa23
							
						
					 | 
					
						
						
							
							去除无效的代码,代码 格式、位置 调整
						
						
						
						
						
						
					 | 
					
						2021-11-05 17:49:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fe7459e6e
							
						
					 | 
					
						
						
							
							!48 增加参数
						
						
						
						
						
						
						
						Merge pull request !48 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-05 03:06:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b98e01b261
							
						
					 | 
					
						
						
							
							增加参数
						
						
						
						
						
						
					 | 
					
						2021-11-05 11:05:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							27efe772ab
							
						
					 | 
					
						
						
							
							!47 优化合并
						
						
						
						
						
						
						
						Merge pull request !47 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-04 06:46:21 +00:00 | 
					
					
						
						
							
							
							
						
					 |