From 570fc0fe4b19a2224d6b1e5bc8b449aad80fbfa1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 28 十月 2024 14:16:39 +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