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

zhaowenyu

2026-01-17 3f957d3cf5d05109867800a2d78ee0bb9ecb4561

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

}