修改BUG 跟新需求
Merge branch 'master' of https://github.com/wsjyz/housekeeping-web

Conflicts:
	src/main/java/com/eighth/housekeeping/controller/OrderServiceController.java
	src/main/java/com/eighth/housekeeping/dao/impl/OrderDAOImpl.java
	src/main/java/com/eighth/housekeeping/service/impl/OrderServiceImpl.java