From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs
index 0b527eb..b3890ac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs
@@ -2,9 +2,12 @@
 
 namespace HStation.WinFrmUI.Basic
 {
-    public class SysPropChoiceViewModel : Yw.Dto.SysPropChoiceDto
+    public class SysPropChoiceViewModel
     {
-        public SysPropChoiceViewModel(SysPropChoiceDto rhs)
+        public SysPropChoiceViewModel()
+        { }
+
+        public SysPropChoiceViewModel(Yw.Vmo.SysPropChoiceVmo rhs)
         {
             this.PropID = rhs.PropID;
             this.ID = rhs.ID;
@@ -13,5 +16,17 @@
             this.Description = rhs.Description;
             this.SortCode = rhs.SortCode;
         }
+
+        public long ID { get; set; }
+
+        public long PropID { get; set; }
+
+        public string Name { get; set; }
+
+        public string Choice { get; set; }
+
+        public int SortCode { get; set; }
+
+        public string Description { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3