fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e10c891ab
							
						
					 | 
					
						
						
							
							'去除处理4.24版本之前订单功能'
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:19:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							643d966740
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:07:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							94968799c3
							
						
					 | 
					
						
						
							
							'合并订单多售后功能'
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:03:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							30d53fa41e
							
						
					 | 
					
						
						
							
							去除无效的引用
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:03:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e7665f59d
							
						
					 | 
					
						
						
							
							店铺收藏/商品收藏问题处理优化
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:00:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							96cc2bd37f
							
						
					 | 
					
						
						
							
							'代码规范'
						
						
						
						
						
						
					 | 
					
						2021-11-30 14:54:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							71e51b3b6f
							
						
					 | 
					
						
						
							
							规范店铺模块调用商品模块方法
						
						
						
						
						
						
					 | 
					
						2021-11-30 10:00:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f90e422e6
							
						
					 | 
					
						
						
							
							'代码格式优化及去除orderItem多余字段'
						
						
						
						
						
						
					 | 
					
						2021-11-29 17:43:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							db587fda30
							
						
					 | 
					
						
						
							
							规范service调用
						
						
						
						
						
						
					 | 
					
						2021-11-29 16:38:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							61aa3ca3d2
							
						
					 | 
					
						
						
							
							敏感词加载继续优化一下,初始化放在consumer中执行
						
						
						
						
						
						
					 | 
					
						2021-11-29 11:47:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d16df738d3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-29 11:17:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ae0921f69
							
						
					 | 
					
						
						
							
							同步在阿里云修改的短信签名
						
						
						
						
						
						
					 | 
					
						2021-11-26 08:39:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dd1c95294
							
						
					 | 
					
						
						
							
							短信签名缺失ID
						
						
						
						
						
						
					 | 
					
						2021-11-25 11:09:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							404fecd83c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-25 09:50:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4fb3db3cd
							
						
					 | 
					
						
						
							
							结算业务代码优化调整
						
						
						
						
						
						
					 | 
					
						2021-11-24 16:23:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							92d64db0b7
							
						
					 | 
					
						
						
							
							去除创建店铺自动创建店铺楼层装修
						
						
						
						
						
						
					 | 
					
						2021-11-24 15:44:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yc_l_zZ_admin
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc36274212
							
						
					 | 
					
						
						
							
							替换 BigDecimal.ROUND_HALF_UP 为 RoundingMode.HALF_UP, 减少冗余代码
						
						
						
						
						
						
					 | 
					
						2021-11-24 14:08:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							58648c3ece
							
						
					 | 
					
						
						
							
							模块隔离优化
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:30:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							16f314bd80
							
						
					 | 
					
						
						
							
							敏感词更新策略问题调整,敏感词迁移至公共工具类
						
						
						
						
						
						
					 | 
					
						2021-11-23 16:56:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8408030a9
							
						
					 | 
					
						
						
							
							敏感词更新策略问题调整,敏感词迁移至公共工具类
						
						
						
						
						
						
					 | 
					
						2021-11-23 16:53:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c276b1595c
							
						
					 | 
					
						
						
							
							微信参数小写处理
						
						
						
						
						
						
					 | 
					
						2021-11-22 18:30:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							71cc57959b
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-11-22 18:20:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbd35c18b5
							
						
					 | 
					
						
						
							
							微信支付签名被xss过滤问题处理忽略
						
						
						
						
						
						
					 | 
					
						2021-11-22 18:20:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e868c2335
							
						
					 | 
					
						
						
							
							修复未登录用户,浏览积分商品报错
						
						
						
						
						
						
					 | 
					
						2021-11-22 10:18:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							59461175d9
							
						
					 | 
					
						
						
							
							修复支付宝配置私钥后无法支付问题
						
						
						
						
						
						
					 | 
					
						2021-11-22 16:45:54 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d14a0adb5
							
						
					 | 
					
						
						
							
							'修改注释规范'
						
						
						
						
						
						
					 | 
					
						2021-11-19 11:41:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							840a2eabdb
							
						
					 | 
					
						
						
							
							'买家端取消售后及管理端终止售后,买家端重新发起售后问题'
						
						
						
						
						
						
					 | 
					
						2021-11-19 11:24:50 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							805197c127
							
						
					 | 
					
						
						
							
							增加订单查询参数(按照评论状态)
						
						
						
						
						
						
					 | 
					
						2021-11-16 18:27:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b6a650ba4
							
						
					 | 
					
						
						
							
							增加订单查询参数(按照评论状态)
						
						
						
						
						
						
					 | 
					
						2021-11-16 17:54:39 +08: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 | 
					
					
						
						
							
							
							
						
					 |