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

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

 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;
   /**