From b8b6286b336ffcb778d5e7ed0e7881ab6f41619f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:02:47 +0800
Subject: [PATCH] Merge branch 'release0123' into Dev-Branch
---
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