User resetPassword done
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	src/main/java/com/noeasy/money/web/controller/UserController.java
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory