From 8f4c7b6cf07296ef5f76eb398f583ac2c3e9a1ee Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 15 十二月 2021 13:38:18 +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