From 4d14154c36ac5692aadc036eed97fb9f1c410e2a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 23 五月 2021 14:46:03 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 HDL_ON/Common/R.cs |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0ca8016..68c931e 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -984,10 +984,20 @@
         public const int xitongweihuzhong = 6078;
         public const int huoqushujushibao = 6079;
         public const int zanshibuzhichigaigongneng = 6080;
-
-
-
-
+        public const int xuanzehongwaipinpai= 6081;
+        public const int yaotou = 6082;
+        public const int disu = 6083;
+        public const int zhongsu = 6084;
+        public const int gaosu = 6085;
+        public const int zidong = 6086;
+        public const int wendujia = 6087;
+        public const int wendujian = 6088;
+        public const int kongqijinghauqi = 6089;
+        public const int reshuiqi = 6090;
+        public const int bucunzaichanpin = 6091;
+        public const int shebeibucunzai = 6092;
+        public const int shebeibuzaixian = 6093;
+        public const int wangguanshebeibuzaixian = 6094;
 
         public const int newAutomation = 7000;
         public const int editAutomation = 7001;

--
Gitblit v1.8.0