From 070d657b793b8ab8800cef94bf7d899a0f4a4fc1 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Thu, 16 Apr 2026 20:30:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E5=87=BA=E5=BA=93=E6=97=B6=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/CLGL/TwOutputmasterService.cs  | 3 ++-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
 SGGL/Model/CLGL/Tw_InOutMasterOutput.cs | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SGGL/BLL/CLGL/TwOutputmasterService.cs b/SGGL/BLL/CLGL/TwOutputmasterService.cs
index 1dc3177e..cc3fa475 100644
--- a/SGGL/BLL/CLGL/TwOutputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwOutputmasterService.cs
@@ -130,7 +130,8 @@ namespace BLL
                        AuditDate2 = x.AuditDate2,
                        WarehouseMan = x.WarehouseMan,
                        WarehouseManName = x.WarehouseManName,
-                       WarehouseDate = x.WarehouseDate
+                       WarehouseDate = x.WarehouseDate,
+                       Remark=x.Remark
 
                    };
         }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 52e87e5f..b3d0f6e1 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -17033,7 +17033,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
diff --git a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
index b1cb0d7d..48187c30 100644
--- a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
+++ b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs
@@ -18,8 +18,7 @@ namespace Model
         public string AuditManName2 { get; set; } 
         public string ReqUnitName { get; set; }   
         public string UnitWorkId { get; set; } 
-        public string WeldTaskCode { get; set; }  
-        public string Remark { get; set; }  
+        public string WeldTaskCode { get; set; }   
 
         public int? PipeLineSortIndex { get; set; }
     }