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/MainView.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index ae546df..cc6dc7d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -124,7 +124,11 @@
/// <summary>
/// 鎸�+璺宠浆鍒伴�昏緫鐣岄潰鐨勬柟娉�
/// </summary>
+<<<<<<< HEAD
public void SkipAddLogicPage(Logic logic=null)
+=======
+ public static void SkipAddLogicPage()
+>>>>>>> origin/CJL-LC
{
if (logic == null)
{
@@ -261,7 +265,7 @@
if (idStr.Code == "0" && idStr.Data != null && idStr.Data.ToString() != "")
{
var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
- var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
+ var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Date>>(date);
for (int i = 0; i < dateList.Count; i++)
{
//娣诲姞閫昏緫ID
@@ -526,12 +530,12 @@
}
}
}
- class LogicData
+ class Date
{
/// <summary>
/// 浜戠鍞竴id
/// </summary>
- public string userLogicId = "";
+ public string userLogicId = "";
/// <summary>
/// 缃戝叧id
/// </summary>
--
Gitblit v1.8.0