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

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

 ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java

@@ -14,7 +14,7 @@
    */
   public int dwSize;
   /**
    * 布撤防类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
    * 布撤防类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
    */
   public int emArmType;
   /**