paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cc4fbb377
							
						
					 | 
					
						
						
							
							修复满优惠券活动赠优惠券/积分/商品不生效问题
						
						
						
						
						
						
					 | 
					
						2021-10-15 11:57:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							7907f16359
							
						
					 | 
					
						
						
							
							!40 add elasticsearch setting index.mapping.total_fields.limit
						
						
						
						
						
						
						
						Merge pull request !40 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-10-15 02:34:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d838f7f3f0
							
						
					 | 
					
						
						
							
							add elasticsearch setting index.mapping.total_fields.limit
						
						
						
						
						
						
					 | 
					
						2021-10-15 10:33:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							ead6a72dec
							
						
					 | 
					
						
						
							
							!39 优化商品索引更新字段方法
						
						
						
						
						
						
						
						Merge pull request !39 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-10-14 07:40:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							55c9a63301
							
						
					 | 
					
						
						
							
							优化商品索引更新字段方法;
						
						
						
						
						
						
						
						修复店铺信息修改后,商品索引的店铺信息不会随之更改; 
						
						
					 | 
					
						2021-10-14 15:37:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							099708390d
							
						
					 | 
					
						
						
							
							增加结算时,检查使用的优惠券是否存在与用户持有的优惠券中
						
						
						
						
						
						
					 | 
					
						2021-10-14 15:33:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							dea2881aa8
							
						
					 | 
					
						
						
							
							!38 修复券活动单独发放部分会员不生效问题
						
						
						
						
						
						
						
						Merge pull request !38 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-10-13 07:49:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							76c253041a
							
						
					 | 
					
						
						
							
							修复券活动单独发放部分会员不生效问题
						
						
						
						
						
						
					 | 
					
						2021-10-13 15:48:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cf180fda0
							
						
					 | 
					
						
						
							
							移动端响应跳转问题处理
						
						
						
						
						
						
					 | 
					
						2021-10-12 16:13:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b03fdd3bbe
							
						
					 | 
					
						
						
							
							支付宝h5支付同步回调报错问题处理
						
						
						
						
						
						
					 | 
					
						2021-10-12 15:53:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d5be1372c
							
						
					 | 
					
						
						
							
							尝试解决H5支付宝支付无法回调问题
						
						
						
						
						
						
					 | 
					
						2021-10-12 15:25:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cee705d63
							
						
					 | 
					
						
						
							
							添加报价单子内容
						
						
						
						
						
						
					 | 
					
						2021-10-12 09:36:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec132009ef
							
						
					 | 
					
						
						
							
							展示报价单详细内容
						
						
						
						
						
						
					 | 
					
						2021-10-11 12:36:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cd07a8503
							
						
					 | 
					
						
						
							
							报价单查询错误
						
						
						
						
						
						
					 | 
					
						2021-10-11 11:12:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ec208fd9e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-10-11 10:56:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf5ce47f32
							
						
					 | 
					
						
						
							
							报价单查询错误
						
						
						
						
						
						
					 | 
					
						2021-10-11 10:56:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b90ee161b5
							
						
					 | 
					
						
						
							
							udesk im集成问题,店铺获取im配置时,未返回问题处理
						
						
						
						
						
						
					 | 
					
						2021-10-11 10:23:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e28d26556a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2021-10-09 19:20:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb6e29fb33
							
						
					 | 
					
						
						
							
							im控制器问题处理
						
						
						
						
						
						
					 | 
					
						2021-10-09 19:20:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lifenlong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8ac7159cf
							
						
					 | 
					
						
						
							
							采购单初期版本
						
						
						
						
						
						
					 | 
					
						2021-10-09 08:08:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							b91927bfde
							
						
					 | 
					
						
						
							
							!37 修复拼团活动单独购买显示拼团价格问题;优化限时抢购和拼团信息显示
						
						
						
						
						
						
						
						Merge pull request !37 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-10-08 08:31:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d6ea5b48d
							
						
					 | 
					
						
						
							
							修复拼团活动单独购买显示拼团价格问题;优化限时抢购和拼团信息显示
						
						
						
						
						
						
					 | 
					
						2021-10-08 16:24:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbacab6bdf
							
						
					 | 
					
						
						
							
							微信枚举类重名,导致代码很难看,代码简单调整
						
						
						
						
						
						
					 | 
					
						2021-10-06 11:37:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							d041e7b5b4
							
						
					 | 
					
						
						
							
							!36 优化logback日志
						
						
						
						
						
						
						
						Merge pull request !36 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-30 07:27:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0440ecea23
							
						
					 | 
					
						
						
							
							优化logback日志
						
						
						
						
						
						
					 | 
					
						2021-09-30 14:48:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdeebc7afb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-30 10:48:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5181a19f29
							
						
					 | 
					
						
						
							
							与微信交互的参数一起打印
						
						
						
						
						
						
					 | 
					
						2021-09-30 10:24:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2f5b6031a
							
						
					 | 
					
						
						
							
							微信消息初始化,日志打印增加
						
						
						
						
						
						
					 | 
					
						2021-09-30 10:09:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							acf2e56ffc
							
						
					 | 
					
						
						
							
							文字错误描述修改
						
						
						
						
						
						
					 | 
					
						2021-09-30 09:15:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							95095f35c0
							
						
					 | 
					
						
						
							
							创建管理员时,头像无法存储问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-29 14:52:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							50c08c0e01
							
						
					 | 
					
						
						
							
							解决买家未登录获取店铺详情403问题
						
						
						
						
						
						
					 | 
					
						2021-09-29 14:40:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4cd51120b
							
						
					 | 
					
						
						
							
							更新readme
						
						
						
						
						
						
					 | 
					
						2021-09-28 16:27:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a550e4051d
							
						
					 | 
					
						
						
							
							微信支付部分退款问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-27 18:19:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d432b0a183
							
						
					 | 
					
						
						
							
							swagger ui 优化
						
						
						
						
						
						
						
						无效类去除精简
修改用户上下文获取request/response的方式 
						
						
					 | 
					
						2021-09-27 18:13:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							444b617c63
							
						
					 | 
					
						
						
							
							去除无效依赖
						
						
						
						
						
						
					 | 
					
						2021-09-27 14:50:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							87c82ce4d3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
						
						合并之前代码,解决部分参数校验问题,解决消息发送加入到两个mq队列通道问题,取消两个无效maven依赖 
						
						
					 | 
					
						2021-09-27 14:31:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdf0f65963
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-27 10:06:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							794a932340
							
						
					 | 
					
						
						
							
							删除管理端自定义分词Controller重复问题。限时抢购活动,修改时增加检查秒杀参数校验
						
						
						
						
						
						
					 | 
					
						2021-09-27 10:06:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							504941eafb
							
						
					 | 
					
						
						
							
							文章展示内容问题处理
						
						
						
						
						
						
					 | 
					
						2021-09-26 17:46:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fafdc087e
							
						
					 | 
					
						
						
							
							!35 修复支付宝支付回调转义问题;修复限时抢购时,结束时间为空的问题
						
						
						
						
						
						
						
						Merge pull request !35 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-26 09:15:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8b2e87570
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2021-09-26 17:13:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							81ce0f4682
							
						
					 | 
					
						
						
							
							修复支付宝支付回调转义问题;修复限时抢购时,结束时间为空的问题
						
						
						
						
						
						
					 | 
					
						2021-09-26 17:13:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							87e5404aa8
							
						
					 | 
					
						
						
							
							文章分类参数校验问题
						
						
						
						
						
						
					 | 
					
						2021-09-26 16:12:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f31946a17
							
						
					 | 
					
						
						
							
							增加字段,标识客服,提供im服务
						
						
						
						
						
						
					 | 
					
						2021-09-26 15:44:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a23b8ac642
							
						
					 | 
					
						
						
							
							商品发布,参数校验调整,分类校验调整
						
						
						
						
						
						
					 | 
					
						2021-09-26 14:40:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							071f8c9d56
							
						
					 | 
					
						
						
							
							优惠券查询接口替换为lambda
						
						
						
						
						
						
					 | 
					
						2021-09-26 10:19:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							76fcf84043
							
						
					 | 
					
						
						
							
							Merge branch 'liushuai'
						
						
						
						
						
						
						
						解决积分商品购买问题,部分参数校验问题,等各种问题优化
# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java 
						
						
					 | 
					
						2021-09-24 18:17:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9b1d78c61
							
						
					 | 
					
						
						
							
							积分赠送以及返还问题处理。
						
						
						
						
						
						
						
						积分购买时预校验,以免下单后取消订单,积分返还无效操作
额外的一些代码完善问题处理 
						
						
					 | 
					
						2021-09-24 18:15:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8de423e7c
							
						
					 | 
					
						
						
							
							!34 DraftGoods get intro and mobileIntro method by HTML unescape
						
						
						
						
						
						
						
						Merge pull request !34 from OceansDeep/feature/pg 
						
						
					 | 
					
						2021-09-24 08:20:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4648ac40f
							
						
					 | 
					
						
						
							
							DraftGoods get intro and mobileIntro method by HTML unescape
						
						
						
						
						
						
					 | 
					
						2021-09-24 16:20:01 +08:00 | 
					
					
						
						
							
							
							
						
					 |