-
Merge pull request !593 from 疯狂的世界/owen_dev
-
Merge pull request !592 from 风狗/feature/mall_product
-
1.用户积分变动方法, 提取到单独的接口中 2.规范代码
-
Merge pull request !591 from 疯狂的世界/owen_dev
-
Conflicts: yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
-
Merge pull request !589 from 风狗/管理后台_用户收件地址管理接口
-
Merge pull request !587 from 风狗/用户信息接口增加areaName字段
-
Merge pull request !585 from 疯狂的世界/member_dev
-
# Conflicts: # sql/mysql/member_level.sql # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
-
Merge pull request !583 from 风狗/会员详情
-
Merge pull request !581 from puhui999/feature/mall_product