| 
							
							
								 paulGao | 337775013e | 修复拼团商品限购数量问题,添加创建订单流程过后清除缓存key | 2021-06-21 14:02:31 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | bfc76f7ceb | 同步master | 2021-06-18 10:03:34 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 7ce5b517fc | 商品评价场景,查询业务重构,代码复用增强,前端可以查看到后端设置隐藏的评价内容问题解决 | 2021-06-17 10:37:11 +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 | 3814b4a9a5 | 暂提 | 2021-06-13 14:51:39 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5a4f8e2a72 | 同步 | 2021-06-13 09:03:16 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | ee01a65d92 | 买家端登录跳转问题处理 | 2021-06-11 15:39:55 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | f7201342d9 | 代码规范度问题处理,注释补充。 | 2021-06-09 16:29:49 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | da1863850a | 主要完善延时任务相关,缺失的注释信息,log记录的信息完善。目录结构优化。 sql数据过大,展示sql默认为false,需要打开手动打开就好。 | 2021-06-08 18:40:32 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 91baf22841 | 无效类去除 | 2021-06-08 09:36:35 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a51e86fd98 | 去除e.printStackTrace();使用slf4j实现 | 2021-06-07 16:49:59 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | b7e439e177 | 店铺导出订单列表 | 2021-06-05 14:04:56 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | ce70a93ff5 | 买家过滤拼团内容 | 2021-06-02 17:56:59 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | f3faec3f72 | 买家过滤拼团内容 | 2021-06-02 17:54:40 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 07b9e413d6 | 添加秒杀活动设置 | 2021-06-02 17:30:32 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 6fb7322e3e | Merge branch 'master' into Bulbasaur | 2021-06-01 15:51:50 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 78aee87b45 | Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur | 2021-05-31 11:34:47 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | e09747c410 | 支持elk | 2021-05-31 11:34:43 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 969437fc34 | 添加商品类型:实物商品、虚拟商品、电子卡券 | 2021-05-28 17:43:55 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 814d118d77 | 运营后台可设置推荐直播间 | 2021-05-28 12:10:33 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 5b5681d748 | 支持短信验证码登录 | 2021-05-26 17:57:51 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 16cc989cdf | 设置秒杀活动为自动开启 | 2021-05-24 18:18:24 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 16498a6850 | Merge branch 'master' into Bulbasaur | 2021-05-21 17:25:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 4c200595a5 | 设置 app版本白名单 | 2021-05-21 14:18:07 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 4b1205c3d3 | APP版本升级 | 2021-05-21 11:59:31 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a15d5d7c36 | Merge branch 'master' into Bulbasaur | 2021-05-20 16:42:06 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | f941841a99 | 分销商品绑定 | 2021-05-20 16:34:48 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | e73d189022 | 解决分销绑定问题 | 2021-05-20 16:20:18 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a8a6506516 | 同步直播状态、直播间新增商品数量 | 2021-05-20 14:56:15 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 250fffab77 | merge master | 2021-05-19 19:29:51 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 120189ef99 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop | 2021-05-19 19:13:53 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 64c095f20e | 分销订单 | 2021-05-19 19:11:57 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | a10110e1f0 | 调整异常机制 | 2021-05-19 14:11:12 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 0173ba814e | Merge branch 'master' into Bulbasaur | 2021-05-18 17:35:48 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 0528a1e1ca | 错误消息机制问题重新处理 | 2021-05-18 15:40:26 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | 591ce04e42 | 会员经验值设置 | 2021-05-17 09:24:58 +08:00 |  | 
			
				
					| 
							
							
								 lifenlong | a10c38f3c1 | 去除final使用@Autowired | 2021-05-13 15:07:03 +08:00 |  | 
			
				
					| 
							
							
								 Chopper | 3785bdb3bb | commit message | 2021-05-13 10:41:46 +08:00 |  |