Merge branch 'device-microservice'

# Conflicts: # src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java # src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java
2025-09-04 12:28:32 +08:00
parent 657eb482bb bbfc61d75a
commit 8ad999f779
53 changed files with 3675 additions and 874 deletions
--- a/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java
+++ b/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java
@@ -28,7 +28,6 @@ public class DeviceEntity {
     * 设备编号
     */
    private String no;
-    private String no2;
    /**
     * 经度
     */