From 1207fd998b9dbcf26ad3b93ee47a148156ac20d3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 11:32:37 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 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 011dc67..0ce8faa 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
@@ -8,8 +8,7 @@
/// <summary>
///
/// </summary>
- public XhsProjectMgrViewModel()
- { }
+ public XhsProjectMgrViewModel() { }
public enum eFileStatus
{
@@ -78,7 +77,6 @@
{
this.Address = Yw.Model.Map.Marker.ToModel(mapInfo.Position).Address;
}
- this.CreateTime = project.NO.Substring(4, 10);
this.Customer = project.Customer;
this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
@@ -121,7 +119,6 @@
{
this.ID = (long)project.ProjectID;
this.NO = project.NO;
- this.CreateTime = project.NO.Substring(4, 10);
this.Name = project.Name;
this.Address = project.Address;
this.Customer = project.Customer;
@@ -155,40 +152,16 @@
public string Name { get; set; }
/// <summary>
- /// 鐢熸晥鏃堕棿
+ /// 瀹㈡埛
/// </summary>
- [Display(Name = "鐢熸晥鏃堕棿")]
- public string StartTime { get; set; }
-
- /// <summary>
- /// 澶辨晥鏃堕棿
- /// </summary>
- [Display(Name = "澶辨晥鏃堕棿")]
- public string EndTime { get; set; }
-
- /// <summary>
- /// 鍙戝竷鐘舵��
- /// </summary>
- [Display(Name = "鍙戝竷鐘舵��")]
- public string PublishStatus { get; set; }
+ [Display(Name = "瀹㈡埛鍚嶇О")]
+ public string Customer { get; set; }
/// <summary>
/// 璇︾粏鍦板潃
/// </summary>
[Display(Name = "璇︾粏鍦板潃")]
public string Address { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Display(Name = "鍒涘缓鏃堕棿")]
- public string CreateTime { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [Display(Name = "瀹㈡埛鍚嶇О")]
- public string Customer { get; set; }
/// <summary>
/// 妯″瀷鐘舵��
@@ -220,11 +193,14 @@
[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 HasModel { get; set; }
/// <summary>
/// 鏄惁瀛樺湪涓夌淮妯″瀷
--
Gitblit v1.9.3