From 47b45a4ac3284936515a2edd3e50265de30993a0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 04 六月 2025 14:50:23 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/Sc_WorkBillSortBillMain.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Sc_WorkBillSortBillMain.cs b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
index 5cc7bff..d10e7bc 100644
--- a/WebAPI/Models/Sc_WorkBillSortBillMain.cs
+++ b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
@@ -68,6 +68,9 @@
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; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1