chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c0700c10e
							
						
					 | 
					
						
						
							
							lilishop.sql
						
						
						
						
						
						
					 | 
					
						2022-10-26 17:38:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							391b35ef1f
							
						
					 | 
					
						
						
							
							sql错误
						
						
						
						
						
						
					 | 
					
						2022-10-25 18:37:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a1c6b9e7f
							
						
					 | 
					
						
						
							
							v4.2.5
						
						
						
						
						
						
					 | 
					
						2022-10-21 11:26:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d98d8eecb
							
						
					 | 
					
						
						
							
							店员
						
						
						
						
						
						
					 | 
					
						2022-10-20 17:28:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d75bb7b7cf
							
						
					 | 
					
						
						
							
							pref:
						
						
						
						
						
						
						
						优化商品草稿/商品模版,sku和批发规则保存规则。
BREAKING CHANGE: li_wholesale 表 增加 template_id(商品模版id)字段 
						
						
					 | 
					
						2022-10-13 12:02:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							55270548c7
							
						
					 | 
					
						
						
							
							SQL,福禄清除
						
						
						
						
						
						
					 | 
					
						2022-09-05 14:43:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							2648a0b57e
							
						
					 | 
					
						
						
							
							店员,商品导入,sql
						
						
						
						
						
						
					 | 
					
						2022-09-01 18:53:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							b873ec2095
							
						
					 | 
					
						
						
							
							电子面单接口完善,商家导入商品功能
						
						
						
						
						
						
					 | 
					
						2022-08-31 17:37:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							05f29a264e
							
						
					 | 
					
						
						
							
							启动报错
						
						
						
						
						
						
					 | 
					
						2022-08-09 20:26:40 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							70b41ab8a8
							
						
					 | 
					
						
						
							
							sql修改
						
						
						
						
						
						
					 | 
					
						2022-07-08 15:17:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							acb9e78a36
							
						
					 | 
					
						
						
							
							增加商品批发销售模式的处理。优化生成商品sku的结构。
						
						
						
						
						
						
					 | 
					
						2022-05-27 16:32:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caihongcheng
							
						 
					 | 
					
						
						
						
						
							
						
						
							b91c8e34c2
							
						
					 | 
					
						
						
							
							电子面单
						
						
						
						
						
						
					 | 
					
						2022-05-09 09:27:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dc86e0482
							
						
					 | 
					
						
						
							
							热词功能完善
						
						
						
						
						
						
					 | 
					
						2022-04-25 18:08:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							947a82eac5
							
						
					 | 
					
						
						
							
							热词统计,热词功能改版
						
						
						
						
						
						
					 | 
					
						2022-04-19 09:28:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cdb461c22
							
						
					 | 
					
						
						
							
							配置文件修改及sql
						
						
						
						
						
						
					 | 
					
						2022-04-07 17:35:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1291d3c43
							
						
					 | 
					
						
						
							
							文件内容错误,恢复内容
						
						
						
						
						
						
					 | 
					
						2022-03-31 14:04:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf667e2aa6
							
						
					 | 
					
						
						
							
							签到问题处理
						
						
						
						
						
						
					 | 
					
						2022-03-31 09:21:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bef12b91b
							
						
					 | 
					
						
						
							
							'合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 18:36:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							441cb6ddcb
							
						
					 | 
					
						
						
							
							'代码合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 17:22:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							eddf3ecdeb
							
						
					 | 
					
						
						
							
							删除更新后文件
						
						
						
						
						
						
					 | 
					
						2022-02-14 19:27:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf8f8d9382
							
						
					 | 
					
						
						
							
							初始化代码 2022-02-11前 最新版本
						
						
						
						
						
						
					 | 
					
						2022-02-11 19:30:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c78711d8e
							
						
					 | 
					
						
						
							
							merge conflict origin/master
						
						
						
						
						
						
					 | 
					
						2022-02-11 15:33:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							23ddca6f82
							
						
					 | 
					
						
						
							
							签到存在事务问题处理。优化这块逻辑相关
						
						
						
						
						
						
					 | 
					
						2022-01-24 17:30:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							87f637099c
							
						
					 | 
					
						
						
							
							'合并master'
						
						
						
						
						
						
					 | 
					
						2022-01-11 14:50:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dfffd60b8
							
						
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:56:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ba4d24041
							
						
					 | 
					
						
						
							
							优化促销。移除结算时促销的依赖。规范部分isxxx字段命名
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:54:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							82e773243f
							
						
					 | 
					
						
						
							
							增加readme描述
						
						
						
						
						
						
					 | 
					
						2021-12-21 10:38:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							795440850b
							
						
					 | 
					
						
						
							
							更名
						
						
						
						
						
						
					 | 
					
						2021-12-21 10:27:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							6cd31e630c
							
						
					 | 
					
						
						
							
							更新升级sql
						
						
						
						
						
						
					 | 
					
						2021-12-21 10:25:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0da8f7f8f6
							
						
					 | 
					
						
						
							
							修复秒杀统计根据状态查询bug
						
						
						
						
						
						
					 | 
					
						2021-12-13 09:13:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							90e550934d
							
						
					 | 
					
						
						
							
							merge branch "master"
						
						
						
						
						
						
					 | 
					
						2021-12-11 17:45:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9d19f8cbd
							
						
					 | 
					
						
						
							
							重构优化促销模块。移除促销相关的mongo
						
						
						
						
						
						
					 | 
					
						2021-12-10 20:15:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c87d13ba2
							
						
					 | 
					
						
						
							
							'去除4.24订单处理功能'
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:28:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e10c891ab
							
						
					 | 
					
						
						
							
							'去除处理4.24版本之前订单功能'
						
						
						
						
						
						
					 | 
					
						2021-11-30 15:19:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f90e422e6
							
						
					 | 
					
						
						
							
							'代码格式优化及去除orderItem多余字段'
						
						
						
						
						
						
					 | 
					
						2021-11-29 17:43:17 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2be8e6abd
							
						
					 | 
					
						
						
							
							'DB-新增字段'
						
						
						
						
						
						
					 | 
					
						2021-11-19 09:26:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f31946a17
							
						
					 | 
					
						
						
							
							增加字段,标识客服,提供im服务
						
						
						
						
						
						
					 | 
					
						2021-09-26 15:44:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3459169885
							
						
					 | 
					
						
						
							
							IM 相关配置提交
						
						
						
						
						
						
					 | 
					
						2021-09-16 15:32:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3564c746c
							
						
					 | 
					
						
						
							
							镜像配置相关提交
						
						
						
						
						
						
					 | 
					
						2021-09-15 17:20:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							80492903ae
							
						
					 | 
					
						
						
							
							修改数据库文件夹名称
						
						
						
						
						
						
					 | 
					
						2021-09-03 16:13:59 +08:00 | 
					
					
						
						
							
							
							
						
					 |