From 2f3a162c3960bedc86081af9823b1683db27bb63 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 29 三月 2021 09:10:43 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 65f372e..fbf9563 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,7 @@
 {
     public static class StringId
     {
+        //public const int EnergyMonitoring = 439;
         public const int EnvirSensorValueTip = 438;
         public const int DeviceList = 437;
         public const int AddedDevice = 436;
@@ -870,6 +871,7 @@
         public const int banbenshengji = 6077;
         public const int xitongweihuzhong = 6078;
         public const int huoqushujushibao = 6079;
+        public const int zanshibuzhichigaigongneng = 6080;
 
 
 

--
Gitblit v1.8.0