From 5dad27b8350e419bd5fc13627c161fc75c5bf824 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 06 五月 2024 08:53:58 +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