From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决
---
Hydraulic/Hydro.MapView/MapViewNetWork.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/MapViewNetWork.cs b/Hydraulic/Hydro.MapView/MapViewNetWork.cs
index 0df3766..ecda281 100644
--- a/Hydraulic/Hydro.MapView/MapViewNetWork.cs
+++ b/Hydraulic/Hydro.MapView/MapViewNetWork.cs
@@ -50,8 +50,9 @@
/// 鏍稿績鎵胯浇瀛楁
/// </summary>
//public new List<LinkViewModel> Links = new List<LinkViewModel>();
-
+ [JsonIgnore]
public Dictionary<string, Dataset> dict_dataset = new Dictionary<string, Dataset>();
+ [JsonIgnore]
public HashSet<string> Hash_ID;
[JsonIgnore]
--
Gitblit v1.9.3