From 21dad2a2c73262cd6787bf78b4806de0b8b20bac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 29 五月 2025 09:20:53 +0800
Subject: [PATCH] 合并冲突 2025-5-29 9:20
---
WebAPI/Models/CheckItem.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/CheckItem.cs b/WebAPI/Models/CheckItem.cs
index afb9aaf..d0d2529 100644
--- a/WebAPI/Models/CheckItem.cs
+++ b/WebAPI/Models/CheckItem.cs
@@ -18,13 +18,29 @@
public string HHelpCode { get; set; } // 鍔╄鐮�
public string HRemark { get; set; } //澶囨敞
+ public string HMakeEmp { get; set; }
public bool HStopflag { get; set; } //绂佺敤鏍囧織
- public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+ public string HUseFlag { get; set; } //浣跨敤鐘舵��
public long HQCCheckClassID { get; set; } //妫�楠岄」鐩被鍒獻D
+ public long HUSEORGID { get; set; }
+ public long HCREATEORGID { get; set; }
public string HQCCheckClassName { get; set; }//妫�楠岄」鐩被鍒�
+ public string HDefaultResult { get; set; }//榛樿缁撹
+
+ public long HUnitID { get; set; } //
+ public string HAnalysisMethod { get; set; } //
+ public string HDefectLevel { get; set; } //
+ public long HDestructInspect { get; set; } //
+ public long HKeyInspect { get; set; } //
+ public long HQualityStdID { get; set; } //
+ public long HInspectMethodID { get; set; } //
+ public long HInspectInstruMentID { get; set; } //
+ public long HInspectBasisID { get; set; } //
+ public long HSampleSchemeID { get; set; } //
+ public long HISsystemSet { get; set; } //
}
}
\ No newline at end of file
--
Gitblit v1.9.1