# Conflicts:
#	signal-utc-service/src/main/java/net/wanji/utc/common/constant/Constants.java
#	signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossInfoMapper.java
#	signal-utc-service/src/main/resources/mapper/CrossInfoMapper.xml