14 Commits

Author SHA1 Message Date
lifenlong
332e287675 修改虚拟订单类型 2021-06-10 20:13:21 +08:00
lifenlong
bbe01e9e67 用户经验值设置 2021-06-05 17:13:04 +08:00
lifenlong
273d0abbc7 解决冲突 2021-05-19 19:38:17 +08:00
lifenlong
250fffab77 merge master 2021-05-19 19:29:51 +08:00
Chopper
97defc8a12 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
2021-05-19 16:36:35 +08:00
Chopper
a10110e1f0 调整异常机制 2021-05-19 14:11:12 +08:00
lifenlong
8d156f01e6 会员积分历史 2021-05-19 09:07:56 +08:00
lifenlong
37a6455e56 会员积分历史 2021-05-19 09:05:44 +08:00
lifenlong
02827a2f8b 微信小程序直播V0.2 2021-05-18 23:34:05 +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
57d65f3fd9 会员等级V0.1 2021-05-16 23:41:33 +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