Conflicts: src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
