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

@@ -18,7 +18,7 @@
*/
public         int               nTypeNum;
/** 
检测类型  {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
检测类型  {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
*/
public         int[]               emType=new int[32];