From 7d49fe63d26ec26ebee525a7ee26d8ee1dfbbc60 Mon Sep 17 00:00:00 2001 From: yangyin <1850366751@qq.com> Date: 星期四, 22 八月 2024 08:48:19 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs index 24adeb0..d6d40ab 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs @@ -17,7 +17,7 @@ /// <summary> /// /// </summary> - public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project) + public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool IsHaveBimface) { this.ID = project.ID; this.ParentID = project.ParentID; @@ -29,15 +29,16 @@ this.TagName = project.TagName; this.SortCode = project.SortCode; this.Description = project.Description; + this.IsHaveBimface = IsHaveBimface; } - /// <summary> - /// - /// </summary> - public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool hasLocation) : this(project) - { - this.HasLocation = hasLocation; - } + /* /// <summary> + /// + /// </summary> + public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool hasLocation) : this(project) + { + this.HasLocation = hasLocation; + }*/ public void Reset(Vmo.Xhs.XhsProjectExtensions project) { @@ -137,10 +138,15 @@ [Display(Name = "璇存槑")] public string Description { get; set; } + /* /// <summary> + /// 瀹氫綅 + /// </summary> + [Display(Name = "瀹氫綅")] + public bool HasLocation { get; set; }*/ + /// <summary> - /// 瀹氫綅 + /// 鏄惁瀛樺湪涓夌淮妯″瀷 /// </summary> - [Display(Name = "瀹氫綅")] - public bool HasLocation { get; set; } + public bool IsHaveBimface { get; set; } } } \ No newline at end of file -- Gitblit v1.9.3