From f0f336798d3042082a1ed277c5384f4d6bb60788 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 19 四月 2022 21:01:59 +0800
Subject: [PATCH] 工序进站接收单列表，工序出站汇报单列表、工序委外接收单列表，工序委外出站单列表模块界面新增未结案过滤选择勾选框；不良品列表模块入库按钮增加点击后变灰
---
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