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

zhaowenyu

2025-11-03 e6292018a3b5a128a77b32b97b25af50d8bcd2f7

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

@@ -30,7 +30,7 @@
*/
public         byte[]               szCompareValue=new byte[32];
/** 
对比值类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
对比值类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public         int               emCompareValueType;
/**