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_IN_SET_2DCODE.java

@@ -17,7 +17,7 @@
    public int dwSize;
    /**
     * 二维码类型,
     * 对应枚举类型{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_2DCODE_TYPE}
     * 对应枚举类型{@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_2DCODE_TYPE}
     */
    public int em2DCodeType;
    /**