From f56fcadd8d412fa1a65c873e77ad04ebb31fc954 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 18 七月 2025 14:27:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api

---
 StandardPda/MES.Service/Dto/webApi/ErpItems.cs |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
index a1a8072..df93d48 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
@@ -16,7 +16,7 @@
     public string? FStockId { get; set; }
 
     public string? FMaterialGroup { get; set; }
-    public int? FIsBatchManage { get; set; }
+    public string? FIsBatchManage { get; set; }
     public string? FPurchaseUnitId { get; set; }
     public string? FStoreUnitID { get; set; }
     public string? FSaleUnitId { get; set; }
@@ -39,4 +39,14 @@
     public string? PrivateDescSeg11 { get; set; }
     public string? PrivateDescSeg7 { get; set; }
     public string? PrivateDescSeg2 { get; set; }
+
+    /// <summary>
+    ///     閲囪喘鍛�
+    /// </summary>
+    public string? Merchandiser { get; set; }
+
+    /// <summary>
+    ///     浠撶鍛�
+    /// </summary>
+    public string? WarehouseKeeper { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3