guoshengxiong 1e0975255a Merge branch 'uat' into dunhuang ...

# Conflicts:
#	src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeController.java
#	src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckController.java
#	src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckRecordController.java
#	src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableController.java
#	src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableRecordController.java
#	src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java

2025-10-11 16:59:10 +08:00

..

main

Merge branch 'uat' into dunhuang

2025-10-11 16:59:10 +08:00

test/java/com/zhgd

监控导入设备重名更新

2025-09-26 19:17:15 +08:00