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

zhaowenyu

2025-10-28 b0da63410a7aaf64b11183c95b3da38013a6457b

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

@@ -39,7 +39,7 @@
     */
    public int      nCount;
    /**
     * 进出方向(事件类型) {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_USER_PASS_TYPE}
     * 进出方向(事件类型) {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_USER_PASS_TYPE}
     */
    public int            emType;
    /**