From 4f09261581ae965fd224985d04aa565e4c310920 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 四月 2025 17:41:26 +0800
Subject: [PATCH] 设备单据模块优化（设备保养计划单、设备保养记录单、设备点检计划单、设备点检记录单、设备工艺参数点检表、设备停机单、设备开机单、设备故障登记单、设备维修派工单、设备维修记录单、设备维修签到单、设备维修验收单）
---
WebAPI/Models/Gy_WorkPayType.cs | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index 8d9cb07..f3c0d96 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,20 +16,11 @@
public long HLevel { get; set; }
public bool HEndFlag { get; set; } //鏈骇鏍囧織
public bool HStopflag { get; set; } //绂佺敤鏍囧織
-<<<<<<< HEAD
-
- public string HRemark { get; set; } //澶囨敞
- public string HUseFlag { get; set; } //浣跨敤鏍囧織
-
-
-
-=======
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
}
}
\ No newline at end of file
--
Gitblit v1.9.1