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/Logic.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index bbbea86..6f70600 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -26,9 +26,13 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 鏄惁鍏佽鍒犻櫎(false=鍙互鍒犻櫎)
+ /// </summary>
+ public bool tag = false;
+ /// <summary>
/// 閫昏緫鍚嶇О
/// </summary>
- public string name = "鑷姩鍖�";
+ public string name = "";
/// <summary>
/// 閫昏緫鏉′欢鍏崇郴锛堜笌and:锛屾垨:or锛�
/// </summary>
@@ -159,7 +163,7 @@
/// <summary>
/// 閫氱煡鍐呭
/// </summary>
- public string noticeContent = "鑷姩鍖栧凡缁忔墽琛�";//string.Empty;
+ public string noticeContent = Shared.Language.StringByID(StringId.Automation)+ Shared.Language.StringByID(StringId.yizhixing); //string.Empty;
}
/// <summary>
/// 鎺ㄩ�侀厤缃�
--
Gitblit v1.8.0