From 49248e3bdff0458f8f6f4156d1425bd6f6074e32 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 13:17:21 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 7398574..d23adfd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -682,7 +682,7 @@
case "time":
{
list = new List<string> {
- "30 s",
+ //"30 s",
"1 min",
"2 min",
"3 min",
@@ -966,7 +966,7 @@
case "(115,150]": {
text = Language.StringByID(StringId.pmzhongdu);
} break;
- case "(151,100000]": {
+ case "(150,100000]": {
text = Language.StringByID(StringId.pmzhongduwuran);
} break;
}
--
Gitblit v1.8.0