From 2348fa0bac35e103cd826580f21c6bffff574a1e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 25 十月 2024 15:53:33 +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/SysPropViewModel.cs |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
index 9a40876..bd654a0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
@@ -2,9 +2,9 @@
 
 namespace HStation.WinFrmUI.Basic
 {
-    public class SysPropViewModel : Yw.Dto.SysPropDto
+    public class SysPropViewModel
     {
-        public SysPropViewModel(SysPropDto rhs)
+        public SysPropViewModel(Yw.Vmo.SysPropVmo rhs)
         {
             ID = rhs.ID;
             GroupID = rhs.GroupID;
@@ -46,7 +46,7 @@
             Description = rhs.Description;
         }
 
-        public void Reset(UpdateSysPropInput rhs)
+        public void Reset(Yw.Vmo.SysPropVmo rhs)
         {
             ID = rhs.ID;
             Name = rhs.Name;
@@ -88,5 +88,27 @@
         public string ExtendTypeDisPlayName { get; set; }
 
         public string FormatDisPlayName { get; set; }
+
+        public long ID { get; set; }
+
+        public long GroupID { get; set; }
+
+        public long TypeID { get; set; }
+
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public Yw.Basic.ePropFormat Format { get; set; }
+
+        public string UnitName { get; set; }
+
+        public bool IsNull { get; set; }
+
+        public string DefaultValue { get; set; }
+
+        public int SortCode { get; set; }
+
+        public string Description { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3