1292 Commits

Author SHA1 Message Date
caihongcheng
b91c8e34c2 电子面单 2022-05-09 09:27:30 +08:00
fengtianyangyang
7cbf638822 配置文件修改 2022-04-07 17:37:59 +08:00
fengtianyangyang
4cdb461c22 配置文件修改及sql 2022-04-07 17:35:22 +08:00
fengtianyangyang
ba57f19ee7 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/shengxing into clerk 2022-04-07 17:13:04 +08:00
fengtianyangyang
9ba2693698 店员错误 2022-04-07 17:09:25 +08:00
fengtianyangyang
6bef12b91b '合并' 2022-03-03 18:36:42 +08:00
fengtianyangyang
5b4113be4d Merge branch 'clerk' of https://gitee.com/beijing_hongye_huicheng/lilishop
 Conflicts:
	config/application.yml
2022-03-03 18:05:32 +08:00
fengtianyangyang
a82d3fe57c '店员权限bug处理合并' 2022-03-03 18:03:04 +08:00
fengtianyangyang
4d551366ed Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk 2022-03-03 17:44:53 +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
OceansDeep
f4d7c07f57
!137 修复更新秒杀活动时间,秒杀活动商品更新数据问题
Merge pull request !137 from OceansDeep/feature/pg
2022-03-03 03:27:08 +00:00
paulGao
66b2f1f55d 修复更新秒杀活动时间,秒杀活动商品更新数据问题 2022-03-03 11:22:20 +08:00
OceansDeep
b9b2c10ca0
!136 增加检测促销商品库存
Merge pull request !136 from OceansDeep/feature/pg
2022-03-02 12:41:01 +00:00
paulGao
0d5f871da7 增加检测促销商品库存 2022-03-02 20:39:17 +08:00
paulGao
1688a7ba15 修复秒杀活动 2022-03-02 20:33:45 +08:00
paulGao
3506e1c738 增加检测促销商品库存 2022-03-02 20:26:50 +08:00
lifenlong
ae0c4aea12 展示店铺设置 2022-03-02 18:42:56 +08:00
itheinjury@163.com
a52b672e9b 更新,BUG修改 2022-03-02 15:17:06 +08:00
paulGao
c4307aa821 修复秒杀商品下单时,不会更新秒杀商品的出售数量问题 2022-03-02 11:49:41 +08:00
OceansDeep
a2c32009f5
!135 修复未开始的秒杀活动修改时,先添加秒杀商品后修改时间时,秒杀活动商品时间没有改变问题
Merge pull request !135 from OceansDeep/feature/pg
2022-03-01 03:50:15 +00:00
paulGao
e27185d424 修复未开始的秒杀活动修改时,先添加秒杀商品后修改时间时,秒杀活动商品时间没有改变问题 2022-03-01 11:49:35 +08:00
paulGao
0714480e01 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-03-01 09:12:02 +08:00
lifenlong
504ee766f8 店铺楼层装修 2022-02-28 09:08:43 +08:00
paulGao
7358fd0c23 增加搜索商品时,无商品索引时初始化索引 2022-02-25 16:23:35 +08:00
OceansDeep
25be7094a2
!134 优化代码
Merge pull request !134 from OceansDeep/feature/pg
2022-02-24 02:17:05 +00:00
paulGao
627a1d7d5a 优化代码 2022-02-24 09:33:36 +08:00
Chopper
63b84ee69d 敏感词为空极端情况处理 2022-02-23 16:23:00 +08:00
Chopper
5eb76176ab Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-02-23 14:38:29 +08:00
Chopper
6115ecf673 秒杀活动自动新增bug处理 2022-02-23 14:38:23 +08:00
OceansDeep
d1a112d3a3
!133 修复秒杀活动
Merge pull request !133 from OceansDeep/feature/pg
2022-02-22 14:46:15 +00:00
paulGao
7d67e6a007 修复秒杀活动 2022-02-22 22:37:51 +08:00
Chopper
b824ee625e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-02-21 22:59:59 +08:00
Chopper
961ac20213 更新IM相关 2022-02-21 22:59:55 +08:00
OceansDeep
f213b6f53f
!132 优化rocketmq日志到logback
Merge pull request !132 from OceansDeep/feature/pg
2022-02-21 04:04:15 +00:00
paulGao
631600ab3f 优化rocketmq日志到logback 2022-02-21 12:03:07 +08:00
Chopper
d95fce2efb 注解日志异常问题处理 2022-02-21 10:57:57 +08:00
OceansDeep
1c6c009f14
!131 优化自动生成秒杀活动
Merge pull request !131 from OceansDeep/feature/pg
2022-02-18 12:27:53 +00:00
paulGao
f555f6423a 优化自动生成秒杀活动 2022-02-18 20:26:35 +08:00
paulGao
cd374f2d98 关闭consumer spring security身份验证页面 2022-02-18 15:38:58 +08:00
itheinjury@163.com
c62f31c387 更新 2022-02-18 11:14:01 +08:00
itheinjury@163.com
87ccad6ec7 更新 2022-02-18 11:04:56 +08:00
itheinjury@163.com
1600f7cdab 更新 2022-02-18 10:52:03 +08:00
itheinjury@163.com
dc3256566b 更新 2022-02-18 00:09:09 +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
itheinjury@163.com
f280ab88ec 更新 2022-02-17 13:57:43 +08:00
Chopper
9616c27efa Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-02-16 17:54:46 +08:00
Chopper
0b5f830d7c 删除模版缓存注解问题处理 2022-02-16 17:54:40 +08:00
OceansDeep
d0f952bd68
!130 修复秒杀每日清除无效活动错误
Merge pull request !130 from OceansDeep/feature/pg
2022-02-16 09:49:38 +00:00