From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc

---
 HDL_ON/Common/R.cs |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 5ffb8da..fb07c0f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,47 @@
 {
     public static class StringId
     {
+
+        /// <summary>
+        /// 娉ㄩ攢璐﹀彿
+        /// </summary>
+        public const int CancelAccount = 526;
+        /// <summary>
+        /// 鍚敤
+        /// </summary>
+        public const int Enable = 525;
+        /// <summary>
+        /// 鍋滅敤
+        /// </summary>
+        public const int Bypass = 524;
+        /// <summary>
+        /// 瑙﹀彂鍚庡欢鏃舵姤璀�
+        /// </summary>
+        public const int DelayAlarm = 523;
+        /// <summary>
+        /// 鍒锋柊
+        /// </summary>
+        public const int Refresh = 522;
+        /// <summary>
+        /// 鍔熺巼(W)
+        /// </summary>
+        public const int ActivePowerAndUnit = 521;
+        /// <summary>
+        /// 鐢垫祦(A)
+        /// </summary>
+        public const int CurrentAndUnit = 520;
+        /// <summary>
+        /// 鐢靛帇(V)
+        /// </summary>
+        public const int VoltageAndUnit = 519;
+        /// <summary>
+        /// 绱鐢ㄧ數
+        /// </summary>
+        public const int CumulativePowerConsumption = 518;
+        /// <summary>
+        /// 鐬椂鍊�
+        /// </summary>
+        public const int InstantaneousValue = 517;
         /// <summary>
         /// 鎾ら攢鍚屾剰
         /// </summary>

--
Gitblit v1.8.0