From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'

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

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
similarity index 99%
rename from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/Logic.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index 50ccd16..95f9f48 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -94,7 +94,7 @@
         /// 閫昏緫杈撳嚭鐩爣绫诲瀷
         /// 璁惧=1;
         /// 鍦烘櫙=2;
-        /// 瀹夐槻=3;
+        /// 寤舵椂=3;
         /// </summary>
         public string target_type = "";
         public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();

--
Gitblit v1.8.0