From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码

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

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index f076168..f4ae025 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -5,7 +5,6 @@
     /// <summary>
     /// 閫昏緫瀛樺偍鏁版嵁瀵硅薄
     /// </summary>
-    [Serializable]
     public class Logic
     {
 
@@ -49,6 +48,7 @@
         /// 閫昏緫杈撳嚭鐩爣鏁扮粍
         /// </summary>
         public List<Output> output = new List<Output>();
+<<<<<<< HEAD
         /// <summary>
         /// 閫氱煡閰嶇疆
         /// </summary>
@@ -58,12 +58,14 @@
         /// </summary>
         public List<PushConfigs> pushConfigs = new List<PushConfigs>();
 
+=======
+       
+>>>>>>> origin/CJL-LC
 
     }
     /// <summary>
     /// 鎵ц鍛ㄦ湡瀵硅薄
     /// </summary>
-    [Serializable]
     public class Cycle
     {
         /// <summary>
@@ -76,7 +78,6 @@
     /// <summary>
     /// 杈撳叆鏉′欢瀵硅薄
     /// </summary>
-    [Serializable]
     public class Input
     {
         /// <summary>
@@ -96,15 +97,10 @@
         /// </summary>
         public string condition_type = "";
         public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
-        /// <summary>
-        /// 鍦扮悊鍥存爮閰嶇疆
-        /// </summary>
-        public Fence geo_fence = new Fence();
     }
     /// <summary>
     /// 杈撳嚭鐩爣瀵硅薄
     /// </summary>
-    [Serializable]
     public class Output
     {
         /// <summary>
@@ -124,6 +120,7 @@
         public string target_type = "";
         public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
     }
+<<<<<<< HEAD
     /// <summary>
     /// 鍦扮悊鍥存爮閰嶇疆
     /// </summary>
@@ -177,6 +174,9 @@
         /// </summary>
         public List<string> pushTarget = new List<string> {};
     }
+=======
+
+>>>>>>> origin/CJL-LC
 
 }
 

--
Gitblit v1.8.0