From 0f72c941f402f624cc6b5d364724d08d6f60dfc3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 07 十一月 2023 11:05:11 +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