Conflicts: src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java src/main/resources/config/dev/xyqb.properties
