Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							59461175d9
							
						
					 | 
					
						
						
							
							修复支付宝配置私钥后无法支付问题
						
						
						
						
						
						
					 | 
					
						2021-11-22 16:45:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							aee5d4be2e
							
						
					 | 
					
						
						
							
							'修改DBsql错误版本文件名称'
						
						
						
						
						
						
					 | 
					
						2021-11-22 15:35:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9c18935c5
							
						
					 | 
					
						
						
							
							'修改DBsql文件错误字段'
						
						
						
						
						
						
					 | 
					
						2021-11-22 15:29:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b80aa48735
							
						
					 | 
					
						
						
							
							'项目启动处理4.24版本之前订单问题'
						
						
						
						
						
						
					 | 
					
						2021-11-22 15:24:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c32999aa03
							
						
					 | 
					
						
						
							
							缩略图相关方法调整
						
						
						
						
						
						
					 | 
					
						2021-11-22 14:55:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							56d486e010
							
						
					 | 
					
						
						
							
							将http工具类整合在一起
						
						
						
						
						
						
					 | 
					
						2021-11-22 10:53:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							d83f82a340
							
						
					 | 
					
						
						
							
							'增加项目启动时对4.2.4之前版本orderItem订单处理'
						
						
						
						
						
						
					 | 
					
						2021-11-19 18:42:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f49292672
							
						
					 | 
					
						
						
							
							update README.md.
						
						
						
						
						
						
					 | 
					
						2021-11-19 04:05:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							c09b6061fc
							
						
					 | 
					
						
						
							
							update README.md.
						
						
						
						
						
						
					 | 
					
						2021-11-19 04:03:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d14a0adb5
							
						
					 | 
					
						
						
							
							'修改注释规范'
						
						
						
						
						
						
					 | 
					
						2021-11-19 11:41:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							840a2eabdb
							
						
					 | 
					
						
						
							
							'买家端取消售后及管理端终止售后,买家端重新发起售后问题'
						
						
						
						
						
						
					 | 
					
						2021-11-19 11:24:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2be8e6abd
							
						
					 | 
					
						
						
							
							'DB-新增字段'
						
						
						
						
						
						
					 | 
					
						2021-11-19 09:26:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							71fb4b2b2b
							
						
					 | 
					
						
						
							
							'多数量商品售后功能'
						
						
						
						
						
						
					 | 
					
						2021-11-18 19:26:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cabf0a32c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-18 17:23:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8416fd49ae
							
						
					 | 
					
						
						
							
							优化代码结构,分包更清晰。
						
						
						
						
						
						
						
						去除无效逻辑。 
						
						
					 | 
					
						2021-11-18 17:23:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a15c2eaa7
							
						
					 | 
					
						
						
							
							!59 优惠券过期处理bug修复
						
						
						
						
						
						
						
						Merge pull request !59 from CodeNose/fixbug_20211117_couponRemoveBug 
						
						
					 | 
					
						2021-11-18 03:36:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0eb76e120
							
						
					 | 
					
						
						
							
							!60 升级版本号
						
						
						
						
						
						
						
						Merge pull request !60 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-17 10:31:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a29ce048d
							
						
					 | 
					
						
						
							
							升级版本号
						
						
						
						
						
						
					 | 
					
						2021-11-17 18:30:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hhf
							
						 
					 | 
					
						
						
						
						
							
						
						
							d43b679f8d
							
						
					 | 
					
						
						
							
							优惠券过期删除bug修复
						
						
						
						
						
						
					 | 
					
						2021-11-17 17:48:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							74abc4b360
							
						
					 | 
					
						
						
							
							!58 优化es默认搜索
						
						
						
						
						
						
						
						Merge pull request !58 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-11-17 09:13:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1c0207a3d
							
						
					 | 
					
						
						
							
							优化es默认搜索
						
						
						
						
						
						
					 | 
					
						2021-11-17 17:06:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f61f98d288
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-17 16:55:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3727b67a23
							
						
					 | 
					
						
						
							
							商品分类控制器无效注入去除,页面请求埋点request替换为静态方法
						
						
						
						
						
						
					 | 
					
						2021-11-17 16:55:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							dae52cd68f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-11-17 16:23:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |