Merge branch 'master' of 192.168.100.249:zjm3/jy-equip-refactoring

# 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

Merge branch 'master' of 192.168.100.249:zjm3/jy-equip-refactoring
79c415c3 · Matrix · 8a532f7e · c7f296d0 · 79c415c3
--- a/dev-repair/pom.xml
+++ b/dev-repair/pom.xml
@@ -36,6 +36,10 @@
            <groupId>com.tykj.dev</groupId>
            <artifactId>config</artifactId>
        </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>device-repair</artifactId>
+        </dependency>
    </dependencies>

 </project>
\ No newline at end of file