From e2f45c6bce38ee2ffca13510fdf67b00100814cd Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 04 六月 2024 00:18:28 +0800
Subject: [PATCH] [合并]
---
Hydraulic/Hydro.MapView/Common/MapDimensions.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
index a21649a..c856579 100644
--- a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
+++ b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
@@ -57,13 +57,12 @@
[Browsable(true)]
public bool isShowPic { get; set; } = true;
-<<<<<<< HEAD
- [Category("4銆佽瑙�")]
-=======
+
+
public bool isAutoBackgroundImage = false;
- [Category("瑙嗚")]
->>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
+
+ [Category("4銆佽瑙�")]
[DisplayName("鏄剧ず鏈�涓嶅埄鐐�")]
[Browsable(true)]
public bool isShowUnfavor { get; set; } = true;
--
Gitblit v1.9.3