From 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 09:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 94b9b38..fbbbdb8 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1902,6 +1902,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" />
@@ -1989,6 +1990,9 @@
<Content Include="Pages\business\xiaoshouyejiKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiList.aspx" />
<Content Include="Pages\business\xiaoshouyejiPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportList.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReportPrint.aspx" />
+ <Content Include="Pages\business\xiaoshouyejiReprotKehu.aspx" />
<Content Include="Pages\business\xiaoshouyejiVisit.aspx" />
<Content Include="Pages\business\YujihuikuanTimeEdit.aspx" />
<Content Include="Pages\common\CMSMergerOrder.ascx" />
@@ -2004,6 +2008,7 @@
<Content Include="Pages\financial\FirmAccountPrintTable.aspx" />
<Content Include="Pages\financial\MemberOrderMoneyReceive.aspx" />
<Content Include="Pages\financial\MemberOrderPayList.aspx" />
+ <Content Include="Pages\financial\OrderFinancialPrint.aspx" />
<Content Include="Pages\financial\OrderMoneyBatchReceive.aspx" />
<Content Include="Pages\financial\OutsourcePayMoney.aspx" />
<Content Include="Pages\financial\OutsourcePayOrder.aspx" />
@@ -3491,6 +3496,13 @@
<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>
<SubType>ASPXCodeBehind</SubType>
@@ -4114,6 +4126,27 @@
<Compile Include="Pages\business\xiaoshouyejiPrint.aspx.designer.cs">
<DependentUpon>xiaoshouyejiPrint.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportList.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReportPrint.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReportPrint.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\xiaoshouyejiReprotKehu.aspx.designer.cs">
+ <DependentUpon>xiaoshouyejiReprotKehu.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\xiaoshouyejiVisit.aspx.cs">
<DependentUpon>xiaoshouyejiVisit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -4204,6 +4237,13 @@
</Compile>
<Compile Include="Pages\financial\MemberOrderPayList.aspx.designer.cs">
<DependentUpon>MemberOrderPayList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\OrderFinancialPrint.aspx.designer.cs">
+ <DependentUpon>OrderFinancialPrint.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\financial\OrderMoneyBatchReceive.aspx.cs">
<DependentUpon>OrderMoneyBatchReceive.aspx</DependentUpon>
@@ -8667,7 +8707,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