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/Base/AreaViewModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
index 79fd354..de6b650 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
@@ -1,4 +1,4 @@
-锘縰sing Yw.WinFrmUI.Q3D;
+锘縰sing Yw.WinFrmUI.Q3d;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -8,12 +8,12 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static Yw.WinFrmUI.Q3D.MapViewEnum;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
-namespace Yw.WinFrmUI.Q3D
+namespace Yw.WinFrmUI.Q3d
{
[Serializable]
- public class Area : BaseModel, IBaseViewModel
+ public class Area : Q3DBaseModel, IBaseViewModel
{
public List<PointF> Points { get; set; }
--
Gitblit v1.9.3