1. mail
2. length
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	src/main/java/com/noeasy/money/admin/controller/AdminOrderController.java
	src/main/java/com/noeasy/money/web/controller/OrderController.java
	src/main/webapp/WEB-INF/jsp/admin/order/editPickupOrder.jsp
	src/main/webapp/WEB-INF/jsp/include/homepage-infobanner.jsp
	src/main/webapp/WEB-INF/jsp/include/homepage-newslist.jsp