From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 8b79424..3160dc2 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,34 @@
 {
     public static class StringId
     {
+
+        /// <summary>
+        /// 瀹夐槻鎶ヨ
+        /// </summary>
+        public const int SecurityAlarmTipString = 501;
+        /// <summary>
+        /// 娣诲姞鍛婅鐩爣
+        /// </summary>
+        public const int AddAlarmTarget = 500;
+        /// <summary>
+        /// 娣诲姞甯冮槻鍔熻兘
+        /// </summary>
+        public const int AddDefenseFunction = 499;
+        /// <summary>
+        /// 瑙﹀彂寤舵椂
+        /// </summary>
+        public const int TriggerDelay = 498;
+        /// <summary>
+        /// 鑷畾涔�
+        /// </summary>
+        public const int Custom = 497;
+        /// <summary>
+        /// 杩樻病鏈夊叧鑱斾换鍔″竷闃茬姸鎬�
+        /// </summary>
+        public const int ThereIsNoAssociatedTaskDeploymentStatus = 496;
+        /// <summary>
+        /// 浜鸿劯閫氳璁剧疆
+        /// </summary>
         public const int FacePassageSetting = 495;
         /// <summary>
         /// 璁剧疆闈㈠
@@ -2511,6 +2539,14 @@
         /// 浼樼
         /// </summary>
         public const int youxiu = 7144;
+        /// <summary>
+        /// 瀹夐槻
+        /// </summary>
+        public const int anfang = 7145;
+        /// <summary>
+        /// 娣诲姞瀹夐槻
+        /// </summary>
+        public const int addSecurityLogic = 7046;
 
 
         #region LE鏂板

--
Gitblit v1.8.0