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

@@ -14,7 +14,7 @@
*/
public         int               nBatteryPercent;
/** 
供电类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_POWER_TYPE}
供电类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_POWER_TYPE}
*/
public         int               emPowerType;