From c9324a4a47a26b7e9df93337bb74c2e95af63da8 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 11 十一月 2021 19:04:35 +0800
Subject: [PATCH] 1、器具档案新增编辑页面增加货主类型、预警寿命 2、新增器具保养规程单
---
WebAPI/Models/Gy_WorkType.cs | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
index 34a1a24..c1a9184 100644
--- a/WebAPI/Models/Gy_WorkType.cs
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -21,14 +21,8 @@
public string HForEmp { get; set; } //鐭唬鐮�
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
-<<<<<<< HEAD
-
-
-
-=======
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1