From aa383c30e4f1053e97c6a33ccf9a899fca26dd20 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 25 8月 2025 13:29:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/WGQ_WB19011
---
DEmon/iWareWms/iWareWms.csproj | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/DEmon/iWareWms/iWareWms.csproj b/DEmon/iWareWms/iWareWms.csproj
index 7910201..7aa3f27 100644
--- a/DEmon/iWareWms/iWareWms.csproj
+++ b/DEmon/iWareWms/iWareWms.csproj
@@ -14,7 +14,7 @@
<RootNamespace>FineUIPro.iWareWms</RootNamespace>
<AssemblyName>iWareWms</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <UseIISExpress>false</UseIISExpress>
+ <UseIISExpress>true</UseIISExpress>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -74,9 +74,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\WebApi\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
- <Reference Include="FineUIPro, Version=5.5.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\FineUIPro.dll</HintPath>
+ <Reference Include="FineUIPro">
+ <HintPath>..\dll\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="iWareDataRbacWms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -3724,9 +3723,13 @@
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
- <DevelopmentServerPort>0</DevelopmentServerPort>
+ <DevelopmentServerPort>65031</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
- <IISUrl>http://localhost/iWareWms</IISUrl>
+<<<<<<< HEAD
+ <IISUrl>http://localhost:8099</IISUrl>
+=======
+ <IISUrl>http://localhost:55234/</IISUrl>
+>>>>>>> c3984d64e9727d60a2a61682271bd52cc82712b9
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
--
Gitblit v1.9.3