'20220917-1'

2 years ago · 74e6908ccc
parent 97215830d6
commit 74e6908ccc
40 changed files with 8 additions and 8 deletions
--- a/BookingJieFeng/BookingJieFeng.csproj.user
+++ b/BookingJieFeng/BookingJieFeng.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
  </PropertyGroup>
  <ProjectExtensions>
--- a/BookingJieFeng/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/BookingJieFeng/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
--- a/BookingWeb/BookingWeb.csproj.user
+++ b/BookingWeb/BookingWeb.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
--- a/BookingWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/BookingWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
--- a/DSWeb.Common/bin/Release/DSWeb.Common.dll
+++ b/DSWeb.Common/bin/Release/DSWeb.Common.dll
--- a/DSWeb.Common/bin/Release/DSWeb.Common.pdb
+++ b/DSWeb.Common/bin/Release/DSWeb.Common.pdb
--- a/DSWeb.Common/obj/Debug/DSWeb.Common.csproj.AssemblyReference.cache
+++ b/DSWeb.Common/obj/Debug/DSWeb.Common.csproj.AssemblyReference.cache
--- a/DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
+++ b/DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
@ -1 +1 @@
-86e121ff91eae4e8a0e70aecc796ab8a6d045f6a
+546fadbd59cfe6f07b28834e5b7752e3de7a4de4
--- a/DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
+++ b/DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
--- a/DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
+++ b/DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
--- a/DSWeb.Interface/bin/Debug/HcDBUtility.dll
+++ b/DSWeb.Interface/bin/Debug/HcDBUtility.dll
--- a/DSWeb.Interface/bin/Debug/HcDBUtility.pdb
+++ b/DSWeb.Interface/bin/Debug/HcDBUtility.pdb
--- a/DSWeb.Interface/bin/Release/DSWeb.Common.dll
+++ b/DSWeb.Interface/bin/Release/DSWeb.Common.dll
--- a/DSWeb.Interface/bin/Release/DSWeb.Common.pdb
+++ b/DSWeb.Interface/bin/Release/DSWeb.Common.pdb
--- a/DSWeb.Interface/bin/Release/DSWeb.Interface.dll
+++ b/DSWeb.Interface/bin/Release/DSWeb.Interface.dll
--- a/DSWeb.Interface/bin/Release/DSWeb.Interface.pdb
+++ b/DSWeb.Interface/bin/Release/DSWeb.Interface.pdb
--- a/DSWeb.Interface/bin/Release/HcDBUtility.dll
+++ b/DSWeb.Interface/bin/Release/HcDBUtility.dll
--- a/DSWeb.Interface/bin/Release/HcDBUtility.pdb
+++ b/DSWeb.Interface/bin/Release/HcDBUtility.pdb
--- a/DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
+++ b/DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
@ -1 +1 @@
-ba5fe1f9f0d9b8159fab664404734e9d37dc2539
+f095c0d0eb1e2cf7e6e71f30fc4934233f1e26b6
--- a/DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
+++ b/DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
@ -119,4 +119,3 @@ H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.c
 H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CopyComplete
 H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.dll
 H:\DS7_CHJY\DSWeb.Interface\obj\Debug\DSWeb.Interface.pdb
-D:\DS7\DSWeb.Interface\bin\Debug\EntityFramework.xml
--- a/DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
+++ b/DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
--- a/DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
+++ b/DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
--- a/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs
+++ b/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs
@ -297,7 +297,8 @@ namespace DSWeb.Areas.Account.Controllers
            {
                headData.DbOperationType = DbOperationType.DbotDel;
            }
-            
+
+            if (headData.ReplacePaymentOPTIME == "") headData.ReplacePaymentOPTIME = null;


            var cansave = CanSave(ref headData);
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@ -4,7 +4,7 @@
    <ProjectView>ShowAllFiles</ProjectView>
    <NameOfLastUsedPublishProfile>H:\DS7_CHJY\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />
--- a/DSWeb/bin/DSWeb.Interface.dll
+++ b/DSWeb/bin/DSWeb.Interface.dll
--- a/DSWeb/bin/DSWeb.Interface.pdb
+++ b/DSWeb/bin/DSWeb.Interface.pdb
--- a/DSWeb/bin/DSWeb.XmlSerializers.dll
+++ b/DSWeb/bin/DSWeb.XmlSerializers.dll
--- a/DSWeb/bin/DSWebComponent.pdb
+++ b/DSWeb/bin/DSWebComponent.pdb
--- a/DSWeb/bin/HcDBUtility.dll
+++ b/DSWeb/bin/HcDBUtility.dll
--- a/DSWeb/bin/HcDBUtility.pdb
+++ b/DSWeb/bin/HcDBUtility.pdb
--- a/DSWeb/bin/JsonHelper.dll
+++ b/DSWeb/bin/JsonHelper.dll
--- a/DSWeb/bin/JsonHelper.pdb
+++ b/DSWeb/bin/JsonHelper.pdb
--- a/DSWeb/bin/WebSqlHelper.dll
+++ b/DSWeb/bin/WebSqlHelper.dll
--- a/DSWeb/bin/WebSqlHelper.pdb
+++ b/DSWeb/bin/WebSqlHelper.pdb
--- a/DispatchWeb/DispatchWeb.csproj.user
+++ b/DispatchWeb/DispatchWeb.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
--- a/DispatchWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/DispatchWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
--- a/HcDBUtility/bin/Debug/HcDBUtility.dll
+++ b/HcDBUtility/bin/Debug/HcDBUtility.dll
--- a/HcDBUtility/bin/Debug/HcDBUtility.pdb
+++ b/HcDBUtility/bin/Debug/HcDBUtility.pdb
--- a/HcDBUtility/bin/Release/HcDBUtility.dll
+++ b/HcDBUtility/bin/Release/HcDBUtility.dll
--- a/HcDBUtility/bin/Release/HcDBUtility.pdb
+++ b/HcDBUtility/bin/Release/HcDBUtility.pdb