From 633a573ec886a2e2411480163f91091cf2b28cd0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:31:17 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/Department.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Department.cs b/WebAPI/Models/Department.cs
index 05723c7..32cf86a 100644
--- a/WebAPI/Models/Department.cs
+++ b/WebAPI/Models/Department.cs
@@ -26,5 +26,9 @@
public string HUpDater { get; set; }
public string HChecker { get; set; }
public string HDeleteMan { get; set; }
+
+ public bool HWorkShopFlag { get; set; }
+
+ public Int64 HEmpQtys { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1