From 71ff3ccde064c104db61fa28300b039456c0ba06 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 14 八月 2024 17:18:18 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/AreaViewModel.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/AreaViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/AreaViewModel.cs
index fb2b842..8e86918 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/AreaViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/AreaViewModel.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yw.WinFrmUI.Q3D
+namespace Yw.WinFrmUI.Q3d
 {
     [Serializable]
     public class AreaViewModel : NodeViewModel, IBaseViewModel

--
Gitblit v1.9.3