From 26b62961ce34bd91ba72560017d166502154aae8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 01 三月 2025 09:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
index a1a8072..51f9269 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; }

--
Gitblit v1.9.3