From 25648562a9c396f9013a26b4a892155ee77becbb Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期五, 14 二月 2025 11:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
index c328731..7a5bb48 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
@@ -867,7 +867,7 @@
/**
* 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
*/
- public static final String TAG_CODE_ZYGGL = "\\_ActivePower_Total";
+ public static final String TAG_CODE_ZYGGL = "ActivePow";
/**
* 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
*/
@@ -887,19 +887,19 @@
/**
* 鎬诲姛鐜囧洜鏁� 鐐逛綅妯℃澘code
*/
- public static final String TAG_CODE_GLYS = "PowerFactor_Total";
+ public static final String TAG_CODE_GLYS = "PowFactorT";
/**
* 鐢垫祦
*/
- public static final String TAG_CODE_CURRENT = "Current_";
+ public static final String TAG_CODE_CURRENT = "Current";
/**
* 鐢靛帇
*/
- public static final String TAG_CODE_VOLTAGE = "Voltage_";
+ public static final String TAG_CODE_VOLTAGE = "Voltage";
/**
* 鍔熺巼鍥犳暟
*/
- public static final String TAG_CODE_FACTOR = "PowerFactor_";
+ public static final String TAG_CODE_FACTOR = "PowerFactor";
/**
* 鍔熺巼鍥犳暟
*/
@@ -935,27 +935,27 @@
/**
* A鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_A = "Current_A";
+ public static final String TAG_CODE_CURRENT_A = "CurrentA";
/**
* B鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_B = "Current_B";
+ public static final String TAG_CODE_CURRENT_B = "CurrentB";
/**
* C鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_C = "Current_C";
+ public static final String TAG_CODE_CURRENT_C = "CurrentC";
/**
* A鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_A = "Voltage_A";
+ public static final String TAG_CODE_VOLTAGE_A = "VoltageA";
/**
* B鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_B = "Voltage_B";
+ public static final String TAG_CODE_VOLTAGE_B = "VoltageB";
/**
* C鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_C = "Voltage_C";
+ public static final String TAG_CODE_VOLTAGE_C = "VoltageC";
/**
* A鐩稿姛鐜囧洜鏁�
*/
--
Gitblit v1.9.3