From df7dd3e3f8830eceb615c59099631fc2a744b0ee Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 27 一月 2021 17:20:42 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c63bf59..280ae05 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -566,8 +566,21 @@
         public const int pmqingdu= 7105;
         public const int pmzhongdu = 7106;
         public const int pmzhongduwuran= 7107;
-
-
+        public const int xieluoandwuxieluo=7108;
+        public const int xieluo = 7109;
+        public const int wuxieluo = 7110;
+        public const int luoshuiandwuluoshui = 7111;
+        public const int luoshui = 7112;
+        public const int wuluoshui = 7113;
+        public const int yourenandwuren = 7114;
+        public const int youren = 7115;
+        public const int wuren = 7116;
+        public const int kaiqiandbihe = 7117;
+        public const int kaiqi = 7118;
+        public const int bihe = 7119;
+        public const int fangchaigongneng = 7120;
+        public const int zaixian = 7121;
+        public const int buzaixian = 7122;
 
         #region LE鏂板
         /// <summary>

--
Gitblit v1.8.0