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/MainView.cs | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs index e933b09..f38003b 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs @@ -576,8 +576,10 @@ /// 閫昏緫浣胯兘锛堝紑锛屽叧锛� /// </summary> public string enable = ""; - //public CycleA cycle; - //public string modifyTime = ""; + /// <summary> + /// 鍦扮悊鍥存爮閰嶇疆 + /// </summary> + public Fence geo_fence = new Fence(); } class CycleA -- Gitblit v1.8.0