From 11e647a74f651ad1e22b7bfe67d9e27db87ab645 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期四, 31 三月 2022 19:45:05 +0800
Subject: [PATCH] 流转卡原料批次非必录,出站单委外接收不良+报废+合格不能小于等于0,并且分别都不能小于0

---
 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