# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java
#	src/main/java/cn/quantgroup/xyqb/controller/middleoffice/wx/WxController.java
#	src/main/java/cn/quantgroup/xyqb/service/middleoffice/applet/impl/AppletServiceImpl.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java