From ae3c361a3f387e9d6963ff4d0a514ebb88ae3e32 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 25 三月 2026 10:39:46 +0800
Subject: [PATCH] 增加获取金蝶基础资料二开方法，工序流转卡派工时候，如果同意机台模具已派工，不允许二次派工
---
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
index 42c9d64..378a086 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
@@ -10,11 +10,6 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
-<<<<<<< HEAD
- <PublishUrl>D:\gz\wy\MES-WEB-API</PublishUrl>
-=======
<PublishUrl>E:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
- <WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1