Conflicts:
	signal-utc-service/src/main/java/net/wanji/utc/common/commonentity/HttpRequest.java
	signal-utc-service/src/main/java/net/wanji/utc/controller/ControlCommandController.java
	signal-utc-service/src/main/java/net/wanji/utc/service/impl/HKControlCommandServiceImpl.java
	signal-utc-service/src/main/java/net/wanji/utc/service/impl/HkGetSignalMethodServiceImpl.java