From 7cfcdb7a90f59bf9001c948e166fd9af09752fe1 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 24 五月 2022 17:15:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc --- HDL_ON/Common/R.cs | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs index acf9214..d537d1f 100644 --- a/HDL_ON/Common/R.cs +++ b/HDL_ON/Common/R.cs @@ -4,6 +4,23 @@ { public static class StringId { + + /// <summary> + /// 鑾峰彇鏇村 + /// </summary> + public const int GetMore = 543; + /// <summary> + /// 寰樺緤鎶ヨ + /// </summary> + public const int WanderingAlarm = 542; + /// <summary> + /// 鐩戞帶涓� + /// </summary> + public const int Monitoring = 541; + /// <summary> + /// 鎶ヨ涓� + /// </summary> + public const int InAlarming = 540; /// <summary> /// 鏅鸿兘闈㈡澘 /// </summary> @@ -2732,6 +2749,22 @@ /// 鍒拌揪 /// </summary> public const int daoda = 7154; + /// <summary> + /// 姹傛晳/姝e父 + /// </summary> + public const int qiujiuandzhengchang = 7155; + /// <summary> + /// 姹傛晳 + /// </summary> + public const int qiujiu = 7156; + /// <summary> + /// 鏄惁寮�閿佹椂 + /// </summary> + public const int shifoukaisuoshi = 7157; + /// <summary> + /// 鏄� + /// </summary> + public const int shi = 7158; -- Gitblit v1.8.0