From 2614964c9c3e0c8740e208d4d0606fa8a518b9c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:16:39 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index a6dc46d..4a53bf1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -364,7 +364,7 @@
                     {
                         ///hcho
                         LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
-                        hchoView.btnText.TextID = StringId.tvoc;
+                        hchoView.btnText.TextID = StringId.Formaldehyde;
                         fLayout.AddChidren(hchoView.FLayoutView());
                         ///hcho鐐瑰嚮浜嬩欢
                         hchoView.btnClick.MouseUpEventHandler += (sender, e) =>

--
Gitblit v1.8.0