From 4fbece886af6bf6df997d7d967888bc72da997ee Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 18 四月 2024 17:04:03 +0800
Subject: [PATCH] 销售订单,发货通知单,退货通知单,销售出库单:表头增加字段:项目编号(HProjectID),界面显示项目编码和项目名称  可选择工程项目为基础资料  表头和表体增加仓库字段(HWHID)  选择表头仓库后,表体仓库为空的也自动填充

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