# Conflicts: # src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java # src/main/resources/config/dev/xyqb.properties
