Conflicts: src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
Conflicts: src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java src/test/java/user/TestUserLogin.java
