-
# Conflicts: # yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
-
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
-
Conflicts: yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
-
Merge pull request !606 from 疯狂的世界/brokerage
-
Merge pull request !593 from 疯狂的世界/owen_dev
-
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