From 85384dd5eaa81be10caeaea5fc827c9e6f7495f7 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 30 三月 2026 21:39:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/Sc_WorkBillSortBillMain.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Models/Sc_WorkBillSortBillMain.cs b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
index 997d946..595fd5e 100644
--- a/WebAPI/Models/Sc_WorkBillSortBillMain.cs
+++ b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
@@ -40,7 +40,7 @@
         public string HSeOrderBillNo { get; set; }
         public int? HGroupID;
         public int? HWorkerID;
-        public int? HWorkShopID;
+        public string HWorkShopID;
         public int? HProdORGID;
         public int? HEntrustORGID;
         public int? HStockInORGID;
@@ -68,6 +68,7 @@
         public string HOrderType { get; set; }
         public string HMonthPlanFlag { get; set; }
         public string HMastersDate { get; set; }
+        public DateTime? HMakeDate { get; set; }
         public string sWheres { get; set; }
 
         public string HVersion_Import { get; set; }

--
Gitblit v1.9.1