From d1f8767a79713d3d22c574854ea73a81fb1ab280 Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期三, 30 七月 2025 13:50:57 +0800 Subject: [PATCH] 添加工序计划条码 --- WebAPI/WebAPI.csproj.user | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index 3b80cf5..4e1fd52 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -3,13 +3,10 @@ <PropertyGroup> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> -<<<<<<< HEAD <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> -======= - <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> ->>>>>>> efb3e796ce184fdd3bfab9c8aab238cec0b20d67 + <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> @@ -25,11 +22,8 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> -<<<<<<< HEAD <ProjectView>ShowAllFiles</ProjectView> -======= <ProjectView>ProjectFiles</ProjectView> ->>>>>>> efb3e796ce184fdd3bfab9c8aab238cec0b20d67 </PropertyGroup> <ProjectExtensions> <VisualStudio> -- Gitblit v1.9.1