From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Models/TechParamByProc.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/TechParamByProc.cs b/WebAPI/Models/TechParamByProc.cs
index 9c067ea..9fe00a5 100644
--- a/WebAPI/Models/TechParamByProc.cs
+++ b/WebAPI/Models/TechParamByProc.cs
@@ -18,6 +18,6 @@
public Int64 HTechParamUnitID { get; set; }
public string HStd { get; set; }
public Int64 HDeptID { get; set; }
- public DateTime HMakeDate { get; set; }
+ //public DateTime HMakeDate { get; set; }
}
}
--
Gitblit v1.9.1