From 06bf635016c8cdd691fac8cda56d6b50915a4996 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 18 五月 2023 08:44:32 +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