Chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6030cc918
							
						
					 | 
					
						
						
							
							fix: 微信消息格式化问题处理,最新版本无法正常发送公众号消息问题处理。以及订单状态判定修复,之前存在消息发送状态判定错误问题
						
						
						
						
						
						
					 | 
					
						2023-03-09 16:54:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu1995@126.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							967852f84d
							
						
					 | 
					
						
						
							
							去除误提交代码
						
						
						
						
						
						
					 | 
					
						2023-02-24 14:55:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu1995@126.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							17734e7a3d
							
						
					 | 
					
						
						
							
							银联支付-云闪付
						
						
						
						
						
						
					 | 
					
						2023-02-24 14:53:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu1995@126.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							98907b33aa
							
						
					 | 
					
						
						
							
							存储新增:腾讯云、华为云
						
						
						
						
						
						
						
						短信新增:腾讯云、华为云
物流新增:快递100
物流查询方式新增:快递查询地图轨迹 
						
						
					 | 
					
						2023-02-16 18:16:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5080cf65c7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
						
						
						
						
						
						
					 | 
					
						2023-01-10 14:34:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc12cecc2a
							
						
					 | 
					
						
						
							
							merge 自提、IM功能
						
						
						
						
						
						
					 | 
					
						2023-01-09 18:00:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ddba831f0
							
						
					 | 
					
						
						
							
							feat: 增加根据促销活动搜索商品索引。增加获取优惠券领取记录。增加优惠券关闭后同时作废所有会员领取的优惠券。
						
						
						
						
						
						
					 | 
					
						2023-01-05 14:39:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							8543a228fd
							
						
					 | 
					
						
						
							
							'优惠券功能改版'
						
						
						
						
						
						
					 | 
					
						2022-12-23 14:51:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							54e04be768
							
						
					 | 
					
						
						
							
							im
						
						
						
						
						
						
					 | 
					
						2022-11-24 18:13:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							49b517f1ab
							
						
					 | 
					
						
						
							
							im
						
						
						
						
						
						
					 | 
					
						2022-11-23 18:44:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							340b5b7248
							
						
					 | 
					
						
						
							
							im
						
						
						
						
						
						
					 | 
					
						2022-11-22 17:31:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							e78ea60644
							
						
					 | 
					
						
						
							
							'限制演示站点部分功能'
						
						
						
						
						
						
					 | 
					
						2022-11-11 15:18:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							67542eebfb
							
						
					 | 
					
						
						
							
							用户信息脱敏
						
						
						
						
						
						
					 | 
					
						2022-10-28 16:58:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a1c6b9e7f
							
						
					 | 
					
						
						
							
							v4.2.5
						
						
						
						
						
						
					 | 
					
						2022-10-21 11:26:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c794bb6a26
							
						
					 | 
					
						
						
							
							redis keys命令可能导致阻塞问题解决以及单元测试
						
						
						
						
						
						
					 | 
					
						2022-09-29 09:26:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							12476fc173
							
						
					 | 
					
						
						
							
							fix: 优化统一接口返回值
						
						
						
						
						
						
					 | 
					
						2022-09-21 16:28:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							178e0d18cd
							
						
					 | 
					
						
						
							
							!234 修复查询满减活动和优惠券活动报错问题
						
						
						
						
						
						
						
						Merge pull request !234 from OceansDeep/feature/pg 
						
						
					 | 
					
						2022-09-14 09:13:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbdcb6f1ce
							
						
					 | 
					
						
						
							
							fix: 修复查询满减活动和优惠券活动报错问题
						
						
						
						
						
						
					 | 
					
						2022-09-14 17:11:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							74cc5af5c9
							
						
					 | 
					
						
						
							
							被批量请求报错信息导致磁盘沾满问题处理
						
						
						
						
						
						
					 | 
					
						2022-09-14 01:32:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							2648a0b57e
							
						
					 | 
					
						
						
							
							店员,商品导入,sql
						
						
						
						
						
						
					 | 
					
						2022-09-01 18:53:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6d43a069f
							
						
					 | 
					
						
						
							
							a
						
						
						
						
						
						
					 | 
					
						2022-08-25 10:47:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							26dd8ed13a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk
						
						
						
						
						
						
						
						 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java 
						
						
					 | 
					
						2022-08-09 18:54:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							72c58059bd
							
						
					 | 
					
						
						
							
							优惠券活动创建限制
						
						
						
						
						
						
					 | 
					
						2022-08-09 16:08:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b21e307640
							
						
					 | 
					
						
						
							
							优化保存楼层装修。优化管理端优惠券搜索
						
						
						
						
						
						
					 | 
					
						2022-07-13 20:03:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b535434ae
							
						
					 | 
					
						
						
							
							代码优化,修复订单投诉问题
						
						
						
						
						
						
					 | 
					
						2022-07-04 18:31:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bb06e7fdc
							
						
					 | 
					
						
						
							
							优化代码,修复bug
						
						
						
						
						
						
					 | 
					
						2022-06-16 10:21:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							056f040317
							
						
					 | 
					
						
						
							
							优化索引生成,商品索引查询
						
						
						
						
						
						
					 | 
					
						2022-06-13 18:50:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0337afbaa
							
						
					 | 
					
						
						
							
							优化代码。升级hutool和lombok依赖
						
						
						
						
						
						
					 | 
					
						2022-05-27 16:32:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caihongcheng
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fccbc2aa2
							
						
					 | 
					
						
						
							
							根据类型查看文章接口缺失
						
						
						
						
						
						
					 | 
					
						2022-05-19 15:23:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6d734bacf
							
						
					 | 
					
						
						
							
							Merge branch 'hotwords'
						
						
						
						
						
						
						
						热词功能,管理端权限存在的问题处理
# Conflicts:
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
#	framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
#	manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java 
						
						
					 | 
					
						2022-04-25 18:32:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dc86e0482
							
						
					 | 
					
						
						
							
							热词功能完善
						
						
						
						
						
						
					 | 
					
						2022-04-25 18:08:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb50510ecb
							
						
					 | 
					
						
						
							
							解决管理员权限相关问题
						
						
						
						
						
						
					 | 
					
						2022-04-25 10:31:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f965c4e56
							
						
					 | 
					
						
						
							
							修复主订单取消后赠品订单不会取消问题。优化热词
						
						
						
						
						
						
					 | 
					
						2022-04-21 16:25:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							947a82eac5
							
						
					 | 
					
						
						
							
							热词统计,热词功能改版
						
						
						
						
						
						
					 | 
					
						2022-04-19 09:28:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							37c5ce541b
							
						
					 | 
					
						
						
							
							优化楼层装修
						
						
						
						
						
						
					 | 
					
						2022-04-17 21:46:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							264a423444
							
						
					 | 
					
						
						
							
							remove invalid class
						
						
						
						
						
						
					 | 
					
						2022-04-14 09:09:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec04c3221f
							
						
					 | 
					
						
						
							
							移除文章类型删除
						
						
						
						
						
						
					 | 
					
						2022-04-13 12:00:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6966376f91
							
						
					 | 
					
						
						
							
							文章增加文章类型修改及文章类型删除
						
						
						
						
						
						
					 | 
					
						2022-04-13 11:06:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cdb461c22
							
						
					 | 
					
						
						
							
							配置文件修改及sql
						
						
						
						
						
						
					 | 
					
						2022-04-07 17:35:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bef12b91b
							
						
					 | 
					
						
						
							
							'合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 18:36:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a82d3fe57c
							
						
					 | 
					
						
						
							
							'店员权限bug处理合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 18:03:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							441cb6ddcb
							
						
					 | 
					
						
						
							
							'代码合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 17:22:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							f14efa2612
							
						
					 | 
					
						
						
							
							BUG修改
						
						
						
						
						
						
					 | 
					
						2022-03-03 16:11:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							a52b672e9b
							
						
					 | 
					
						
						
							
							更新,BUG修改
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:17:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							631600ab3f
							
						
					 | 
					
						
						
							
							优化rocketmq日志到logback
						
						
						
						
						
						
					 | 
					
						2022-02-21 12:03:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							87ccad6ec7
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-18 11:04:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0858429fb
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-17 13:58:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f3e2a5ae8
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-17 13:58:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							fda3b5b1cc
							
						
					 | 
					
						
						
							
							会员脱敏处理,之前有人恶意联系注册用户。
						
						
						
						
						
						
						
						管理平台用户返回VO格式化一下 
						
						
					 | 
					
						2022-02-15 11:24:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							65bd2ff35f
							
						
					 | 
					
						
						
							
							删除更新后文件
						
						
						
						
						
						
					 | 
					
						2022-02-14 20:01:44 +08:00 | 
					
					
						
						
							
							
							
						
					 |