From 27d7b50f43c85f12507ab1a61290fa9551d4d780 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 17 五月 2022 16:58:35 +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