From b445defcf7e9dad85032a8279cca29a2892d3089 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 05 九月 2024 12:38:58 +0800
Subject: [PATCH] 修改生产报表查询方法,物料新增编辑增加事业部与项目保存字段

---
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index 8d164d4..f063768 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+=======
     <DeleteExistingFiles>True</DeleteExistingFiles>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
+<<<<<<< HEAD
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+=======
     <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1