From d8b5d32c3fa3be017b05d7c2c7b53a2f0f356ffe Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 26 十二月 2025 16:30:59 +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