From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +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 |   16 ++++++++++++++--
 1 files changed, 14 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 357b32e..3a6cdcc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropChoiceViewModel.cs
@@ -2,12 +2,12 @@
 
 namespace HStation.WinFrmUI.Basic
 {
-    public class SysPropChoiceViewModel : Yw.Dto.SysPropChoiceDto
+    public class SysPropChoiceViewModel
     {
         public SysPropChoiceViewModel()
         { }
 
-        public SysPropChoiceViewModel(SysPropChoiceDto rhs)
+        public SysPropChoiceViewModel(Yw.Vmo.SysPropChoice rhs)
         {
             this.PropID = rhs.PropID;
             this.ID = rhs.ID;
@@ -16,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