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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/DEmon/iWareWms/iWareWms.csproj b/DEmon/iWareWms/iWareWms.csproj
index c8cd918..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>
@@ -3725,7 +3725,11 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65031</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
+<<<<<<< HEAD
<IISUrl>http://localhost:8099</IISUrl>
+=======
+ <IISUrl>http://localhost:55234/</IISUrl>
+>>>>>>> c3984d64e9727d60a2a61682271bd52cc82712b9
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
--
Gitblit v1.9.3