| 
							
							
								 lifenlong | e0ca366431 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop | 2021-07-13 10:28:48 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3d3be0b283 | 查看店铺经营范围 | 2021-07-13 10:28:04 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 656e2a9307 | 合并 | 2021-07-12 23:41:23 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 7f08124afc | 砍价活动第一版本 | 2021-07-12 23:38:32 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 86f010b87e | maven 规范 | 2021-07-12 16:33:32 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d29d166ce0 | banner 统一 | 2021-07-12 14:44:11 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 18d2379a19 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 08:42:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 3e73257922 | 采用阿里代码规约,对代码进行优化 | 2021-07-09 01:56:24 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 0e7a4ee06c | Merge branch 'master' into qiuqiu | 2021-07-06 18:36:01 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 531ca13555 | 砍价商品 | 2021-07-06 18:35:40 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 177cd86366 | 支持添加重复名称的商品分类 | 2021-07-05 11:14:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | c10b698aed | 支持文章传图 | 2021-07-03 13:40:18 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 931276f72b | 添加ResultCode | 2021-07-01 11:17:18 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 079437100d | 版本好升级 | 2021-06-30 19:59:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 23388eff6b | 升级项目版本号 | 2021-06-30 14:53:26 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d96d5edcd5 | 会员提现api注解问题处理 | 2021-06-29 10:13:18 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | ac68acda50 | 兼容性问题处理 | 2021-06-25 10:37:31 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | d99a4d2d50 | 商品参数编辑问题处理 | 2021-06-25 10:35:22 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 02d23dc217 | 1、主要解决商品参数后端存储格式问题,结构问题等 2、配送商品超出配送区域提出警告,但是依然可以下单问题处理 | 2021-06-25 09:46:38 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | 0121c546f4 | 修复分类参数修改索引属性后没有同步到商品参数问题 | 2021-06-24 09:20:13 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 8d5d902550 | 管理端验证码登录校验 | 2021-06-23 16:47:16 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7851e8af39 | 规格代码相关改版 | 2021-06-23 16:46:52 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a5fa7cadcd | 规格搜索以规格id为准 | 2021-06-23 09:44:53 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 911df97422 | 商品规格相关问题处理 | 2021-06-22 18:58:55 +08:00 |  | 
			
				
					| 
							
							
								 OceansDeep | 54408db0f0 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg | 2021-06-21 16:10:06 +00:00 |  | 
			
				
					| 
							
							
								 paulGao | 41a86ff7dc | 修复商品索引参数问题 | 2021-06-22 00:07:33 +08:00 |  | 
			
				
					| 
							
							
								 chopper711 | eb1b6fac5c | !7 会员站内信功能相关合并 Merge pull request !7 from chopper711/qiuqiu | 2021-06-21 14:16:44 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c7e4af6175 | 注释规范 | 2021-06-21 14:14:07 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 738a95edb6 | 分类信息保存增加校验 | 2021-06-18 17:33:45 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e5b9280b7e | 关闭券活动 | 2021-06-18 16:36:53 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | c787b4762b | 优惠券问题粗粝 | 2021-06-18 16:20:00 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 30d34d69f1 | Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur | 2021-06-18 14:23:54 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7113914ccd | 交互对象调整 | 2021-06-18 14:23:51 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | bfc76f7ceb | 同步master | 2021-06-18 10:03:34 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 0cfb196918 | Merge branch 'master' into qiuqiu | 2021-06-18 07:55:53 +08:00 |  | 
			
				
					| 
							
							
								 pikachu | 975550374a | 新增会员站内信消息 | 2021-06-18 07:55:25 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 67e31bff07 | 同步master | 2021-06-17 11:15:56 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0995a3b75f | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop | 2021-06-17 10:38:07 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7ce5b517fc | 商品评价场景,查询业务重构,代码复用增强,前端可以查看到后端设置隐藏的评价内容问题解决 | 2021-06-17 10:37:11 +08:00 |  | 
			
				
					| 
							
							
								 paulGao | c69cd0c22d | 修复拼团商品下单问题和添加商品是否需要索引 | 2021-06-17 09:11:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | fbcd5b7470 | app版本修改,过滤当前版本 | 2021-06-17 00:28:36 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 00182f5cfb | 限制官网地区同步功能 | 2021-06-16 10:49:17 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 841903d2a6 | 优惠券活动问题处理 | 2021-06-15 18:10:25 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a97b698d8e | Merge branch 'master' into Bulbasaur # Conflicts:
#	consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
#	consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
#	framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java | 2021-06-15 15:50:54 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 24bb6a4169 | 代码同步 | 2021-06-15 15:28:33 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 10dbed04b6 | 初始化秒杀活动 | 2021-06-13 16:27:40 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5a4f8e2a72 | 同步 | 2021-06-13 09:03:16 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 332e287675 | 修改虚拟订单类型 | 2021-06-10 20:13:21 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 9195292aa9 | 演示站点部分权限控制 | 2021-06-10 17:40:53 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | da1863850a | 主要完善延时任务相关,缺失的注释信息,log记录的信息完善。目录结构优化。 sql数据过大,展示sql默认为false,需要打开手动打开就好。 | 2021-06-08 18:40:32 +08:00 |  |