# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/aspect/captcha/PasswordErrorFiniteValidateAdvisor.java
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
#	src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java