From 30aa7034a4b73d46c594f10158249b388a983d2b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 16 七月 2021 17:42:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 147469f..787fc50 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -299,10 +299,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <None Include="Web References\WebS\Reference.map">
+ <Content Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </None>
+ </Content>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -569,10 +569,16 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
- <UrlBehavior>Static</UrlBehavior>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
+ <UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
@@ -580,12 +586,6 @@
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
</WebReferenceUrl>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1