# Conflicts:
#	dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetailEntity.java
#	dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java
#	dev-device/device-user/pom.xml
#	dev-device/pom.xml
#	dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
#	dev-union/pom.xml
#	dev-union/src/main/resources/application.properties
#	dev-user/src/main/java/com/tykj/dev/device/user/util/UserUtils.java
#	dev-usereport/src/main/java/com/tykj/dev/device/usereport/controller/DeviceUseReportController.java
#	dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java
#	pom.xml