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

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

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

@@ -14,7 +14,7 @@
*/
public NET_TIME_EX stuStartTime=new NET_TIME_EX();
/** 
检测类型   {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
检测类型   {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
*/
public         int[]               emType=new int[32];
/**