From d5a2d7e66f9c8046bd88b8269e61aac5a2a265e2 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs
index 6adeea8..8ea9163 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs
@@ -1,5 +1,4 @@
-锘縰sing HStation.PBS;
-using System.ComponentModel;
+锘縰sing System.ComponentModel;
 using Yw.Untity;
 
 namespace PBS.WinFrmUI
@@ -26,7 +25,24 @@
             this.Vmo = rhs;
         }
 
-        public void Resert(Vmo.PlaceVmo rhs)
+        public PlaceViewModel(Vmo.PlaceVmo rhs, Yw.Vmo.MapInfoVmo map)
+        {
+            this.ID = rhs.ID;
+            this.RegionID = rhs.RegionID;
+            this.Name = rhs.Name;
+            this.PlaceType = rhs.PlaceType;
+            this.PlaceInfo = rhs.PlaceInfo;
+            this.Address = rhs.Address;
+            this.UseStatus = rhs.UseStatus;
+            this.SortCode = rhs.SortCode;
+            this.Description = rhs.Description;
+            this.Paras = rhs.Paras;
+            this.Flags = FlagsHelper.ToString(rhs.Flags);
+            this.Vmo = rhs;
+            this.MapInfo = map;
+        }
+
+        public void Resert(Vmo.PlaceVmo rhs, Yw.Vmo.MapInfoVmo map)
         {
             this.ID = rhs.ID;
             this.RegionID = rhs.RegionID;
@@ -40,6 +56,7 @@
             this.Description = rhs.Description;
             this.Flags = FlagsHelper.ToString(rhs.Flags);
             this.Vmo = rhs;
+            this.MapInfo = map;
         }
 
         /// <summary>
@@ -126,6 +143,14 @@
         [Browsable(true)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// 鍦烘墍淇℃伅
+        /// </summary>
         public Vmo.PlaceVmo Vmo { get; set; }
+
+        /// <summary>
+        /// 鍦板浘淇℃伅
+        /// </summary>
+        public Yw.Vmo.MapInfoVmo MapInfo { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3