接口修改
Merge branch 'master' of https://github.com/wsjyz/manhattan

Conflicts:
	src/main/java/com/manhattan/controller/RemoteController.java
	src/main/java/com/manhattan/service/InformationService.java
	src/main/java/com/manhattan/service/impl/InformationServiceImpl.java