Refactory format
resovle conflicts
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	src/main/java/com/noeasy/money/admin/controller/AdminController.java
	src/main/java/com/noeasy/money/admin/controller/ImageUploadController.java
	src/main/java/com/noeasy/money/constant/Constants.java
	src/main/java/com/noeasy/money/constant/DBConstant.java
	src/main/java/com/noeasy/money/filter/HTMLEscapeFilter.java
	src/main/java/com/noeasy/money/model/HelloWroldBean.java
	src/main/java/com/noeasy/money/model/PageBean.java
	src/main/java/com/noeasy/money/model/User.java
	src/main/java/com/noeasy/money/repository/IBaseRepository.java
	src/main/java/com/noeasy/money/repository/impl/HelloWorldService.java
	src/main/java/com/noeasy/money/service/IBaseService.java
	src/main/java/com/noeasy/money/service/IHelloWorldService.java
	src/main/java/com/noeasy/money/service/impl/BaseService.java
	src/main/java/com/noeasy/money/service/impl/DormitoryService.java
	src/main/java/com/noeasy/money/util/pagenation/GenericPagenation.java
	src/main/java/com/noeasy/money/util/pagenation/GenericPagenationMetadata.java
	src/main/java/com/noeasy/money/util/pagenation/IPagenation.java
	src/main/java/com/noeasy/money/util/pagenation/IPagenationMetadata.java
	src/main/java/com/noeasy/money/util/servlet/HTMLEscapeRequestWrapper.java
	src/main/java/com/noeasy/money/util/servlet/HttpServletUtil.java
	src/main/java/com/noeasy/money/web/controller/DormitoryController.java
	src/main/java/com/noeasy/money/web/controller/HomepageController.java