Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

 ard-device/src/main/java/com/ard/device/camera/mapper/ArdCameraMapper.java

@@ -84,6 +84,6 @@
     */
    public int resetCameraLoginId(ArdCamera camera);


    ArdCamera checkAirportHasCamera(ArdCamera camera);

}