u
forgetpasswd
forgetpasswd
Revert "forgetpasswd"

This reverts commit b663d8817e81a19c897fd96e3bd75ad3d098c068.
forgetpasswd
forgetpasswd

forgetpasswd
verifyAccount
1

2
verifyAccount
forgetPasswd
forgetpasswd
forgetpasswd
forgetpasswd
forgetpasswd
forgetpasswd
forgetpasswd
forgetpasswd
Merge branch 'master' of
https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git

Conflicts:
	.gitignore
	src/main/java/com/webloan/user/controller/UserController.java
	src/main/resources/mvc/common/appContext-mvc.xml