# Conflicts:
#	signal-utc-service/src/main/java/net/wanji/utc/common/baseentity/BaseCrossInfo.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/commonentity/Direction.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/commonentity/Road.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/constant/Constants.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/genericentity/ManufacturerRes.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/genericentity/OutVO.java
#	signal-utc-service/src/main/java/net/wanji/utc/common/typeenum/BasicEnum.java
#	signal-utc-service/src/main/java/net/wanji/utc/controller/StaticInfoController.java
#	signal-utc-service/src/main/java/net/wanji/utc/po/CrossInfoPO.java
#	signal-utc-service/src/main/java/net/wanji/utc/service/StaticInfoService.java
#	signal-utc-service/src/main/java/net/wanji/utc/service/impl/StaticInfoServiceImpl.java
#	signal-utc-service/src/main/java/net/wanji/utc/vo/CrossInfoInVO.java
#	signal-utc-service/src/main/java/net/wanji/utc/vo/DetailCrossInfoVO.java