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

zhaowenyu

2025-11-28 d76f8e3b59969d4bf0f1bf4c92730719bd5389d3

 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);

}