From 4ff37d6fe8333e2da2cfc2c50d6770e217f67e7c Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 23 十二月 2021 10:04:57 +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