From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/Common/R.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b0096f8..9464539 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1386,7 +1386,7 @@
public const int xuanzehongwaipinpai= 6081;
public const int yaotou = 6082;
public const int disu = 6083;
- public const int zhongsu = 6084;
+ public const int fengsuqiehuan = 6084;
public const int gaosu = 6085;
public const int zidong = 6086;
public const int wendujia = 6087;
@@ -1397,6 +1397,8 @@
public const int shebeibucunzai = 6092;
public const int shebeibuzaixian = 6093;
public const int wangguanshebeibuzaixian = 6094;
+ public const int anniuchaochu30 = 6095;
+
public const int newAutomation = 7000;
public const int editAutomation = 7001;
@@ -1534,6 +1536,16 @@
public const int yizhixing = 7133;
public const int mubiaozhuangtai = 7134;
public const int diedao = 7135;
+ public const int wendu = 7136;
+ public const int shidu = 7137;
+ public const int pm25 = 7138;
+ public const int co2 = 7139;
+ public const int tvoc = 7140;
+ public const int chaobiao = 7141;
+ public const int yanzhong = 7142;
+ public const int piangao = 7143;
+ public const int youxiu = 7144;
+
#region LE鏂板
/// <summary>
--
Gitblit v1.8.0