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

zhaowenyu

2025-12-12 c0b167404dbc4e98ccb8b84f94f48c96bcb3df02

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

@@ -18,7 +18,7 @@
     */
    public boolean           bContinue2Upload;
    /**
     * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_REASON_TYPE}
     * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_REASON_TYPE}
     */
    public int               emType;
    public NET_OUT_PRE_UPLOAD_REMOTE_FILE(){