-
# 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