From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 4 ++--
1 files changed, 2 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 d865bad..bbbea86 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -88,12 +88,12 @@
/// 鏃堕棿鐐规潯浠�=1;
/// 鏃堕棿娈垫潯浠�=2;
/// 璁惧鐘舵�佸彉鍖栨潯浠�=3;
- /// 鐜淇℃伅鏉′欢=4;
+ /// 鐜淇℃伅鏉′欢=4(搴熷純);
/// 瀹夐槻鏉′欢=5;
/// 浜戠澶╂皵鏉′欢=6;
/// 鏌愪釜閫昏緫/鍦烘櫙鐨勮緭鍑烘潯浠�=7;
/// 鍦扮悊鍥存爮=8;
- /// 绌烘皵璐ㄩ噺=9;
+ /// 绌烘皵璐ㄩ噺=9(搴熷純);
/// 鍦烘櫙=10;
/// </summary>
public string condition_type = "";
--
Gitblit v1.8.0