From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Models/Gy_WorkCenter.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkCenter.cs b/WebAPI/Models/Gy_WorkCenter.cs
index 37731a1..fdfca3b 100644
--- a/WebAPI/Models/Gy_WorkCenter.cs
+++ b/WebAPI/Models/Gy_WorkCenter.cs
@@ -12,17 +12,21 @@
public string HName { get; set; } //
public string HHelpCode { get; set; } //鍔╄鐮�
public string HShortNumber { get; set; } //鐭唬鐮�
- public string HEndFlag { get; set; } //鏈骇鏍囧織
- public string HStopflag { get; set; } //绂佺敤鏍囧織
+ public bool HEndFlag { get; set; } //鏈骇鏍囧織
+ public bool HStopflag { get; set; } //绂佺敤鏍囧織
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
public long HParentID { get; set; } //鐖剁骇ID
+ public string HDeptNumber { get; set; }
public long HDeptID { get; set; }
public long HWorkTimes { get; set; }
public long HQty { get; set; }
public long HProcID { get; set; }
+ public long HLevel { get; set; }
public long HDayMoney { get; set; }
-
+ public int HUSEORGID { get; set; }
+ public int HCREATEORGID { get; set; }
+
public string HBarCodeForBase { get; set; }
}
--
Gitblit v1.9.1