From 1435b5b13b3857a20292d5c869f95e0c2ae5ffea Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期一, 13 九月 2021 15:09:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 6eac3c9..404c4cd 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1886,6 +1886,7 @@
     <Content Include="Pages\business\DemandDescribeDeatil.aspx" />
     <Content Include="Pages\business\DemandOrderCreate.aspx" />
     <Content Include="Pages\business\EvaluationBuyer.aspx" />
+    <Content Include="Pages\business\kaipiaoConfirm.aspx" />
     <Content Include="Pages\business\EvaluationSeller.aspx" />
     <Content Include="Pages\business\FileUpload.aspx" />
     <Content Include="Pages\business\FollowRecord.aspx" />
@@ -3458,6 +3459,13 @@
     </Compile>
     <Compile Include="Pages\business\EvaluationBuyer.aspx.designer.cs">
       <DependentUpon>EvaluationBuyer.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\kaipiaoConfirm.aspx.cs">
+      <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\kaipiaoConfirm.aspx.designer.cs">
+      <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
     </Compile>
     <Compile Include="Pages\business\EvaluationSeller.aspx.cs">
       <DependentUpon>EvaluationSeller.aspx</DependentUpon>
@@ -8642,7 +8650,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="bin\" />
     <Folder Include="CacheFiles\" />
     <Folder Include="images\HtmlEditor\ProcessRequest\" />
     <Folder Include="images\HtmlEditor\UploadImage\" />

--
Gitblit v1.9.1