-
# Conflicts: # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
-
Merge pull request !577 from 疯狂的世界/member_dev
-
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
-
Merge pull request !573 from Carry/master
-
Merge pull request !575 from QingX/feature/mall_product
-
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
-
1.会员设置标签
-
2. 增加获得优惠劵、收藏数量的 API 接口
-
1.增加会员标签功能
-
1、简化交易订单的逻辑
-
1、简化交易订单的逻辑
-
1、完善整个流程的实现
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java
-
1. 售后订单，增加对 afterSaleId 的更新