10 Commits

Author SHA1 Message Date
pikachu
3648929ed3 积分类型修改 2021-08-06 19:17:16 +08:00
Chopper
f20ce80c96 订单促销类型字段 2021-08-03 14:24:47 +08:00
Chopper
829472c6a3 Merge remote-tracking branch 'origin/qiuqiu'
合并砍价/积分相关

# Conflicts:
#	consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
#	update-sql/version4.2to4.3.sql
2021-07-30 15:50:36 +08:00
chopper711
0c87c6f080 update update-sql/version4.2to4.3.sql.
sql格式化问题存在错误,重新导入
2021-07-30 03:23:23 +00:00
lifenlong
0cad52cfa6 同步master 2021-07-27 17:26:12 +08:00
Chopper
b8634e9d59 最新菜单结构 2021-07-27 17:08:30 +08:00
lifenlong
5a7440c5bf 同步master,解决冲突 2021-07-27 10:00:34 +08:00
Chopper
a407d3a539 修改sql中的菜单名称 2021-07-26 17:21:02 +08:00
Chopper
ad2640dac9 热词菜单处理sql提交 2021-07-26 16:12:59 +08:00
lifenlong
7c48413d6b 结算单添加积分、砍价商品结算价 2021-07-24 17:06:24 +08:00