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/ClsSb_EquipMaintainRuleBillMain.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
index 9b70bf6..399a6f9 100644
--- a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
@@ -16,5 +16,6 @@
public Int64 HSafeDays;//淇濆吇瀹夊叏澶╂暟
public Int64 HErrWarDays;//淇濆吇棰勮澶╂暟
+ public bool HStandard;//榛樿瑙勭▼
}
}
\ No newline at end of file
--
Gitblit v1.9.1