Conflicts: src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java src/test/java/user/TestUserLogin.java
Java-刘 彧阳 authored