From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
index 33ad3df..9d0a780 100644
--- a/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
+++ b/WebAPI/Models/ClsSb_EquipDotCheckBillSub.cs
@@ -25,7 +25,10 @@
public string HUnitName;
public Int64 HManagerID;
public string HManagerNumber;
- public string HManagerName;
+ public string HManagerName;
+ public string HDotCheckResult;
+ public Int64 HDotCheckItemClassID;// 点检项目分类(gy_DotCheckItemClass)
+ public Int64 HDotCheckItemMethodID;// 点检方法(gy_DotCheckItemMethod)
}
}
--
Gitblit v1.9.1