From 7992fcc44d231e823736fd36483bf990a28b0536 Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期五, 08 十月 2021 09:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user |   63 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user b/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
index cb16234..a1b85e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/CY_ECommercePlatform/CY.WebForm/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PublishTargetUrl>D:\chuanyin-group-project\CY_ECommercePlatform\CY.WebForm\bin\app.publish\</_PublishTargetUrl>
+    <_PublishTargetUrl>D:\chuanyin-group-project-git\CY_ECommercePlatform\CY.WebForm\bin\app.publish\</_PublishTargetUrl>
   </PropertyGroup>
   <ItemGroup>
     <File Include="Ajax.ashx">
@@ -26,10 +26,10 @@
       <publishTime>11/21/2013 14:54:33</publishTime>
     </File>
     <File Include="bin/AbstractFactory.dll">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/AbstractFactory.pdb">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/Ajax.dll">
       <publishTime>04/02/2013 10:59:52</publishTime>
@@ -44,28 +44,28 @@
       <publishTime>04/02/2013 10:59:52</publishTime>
     </File>
     <File Include="bin/CY.BLL.dll">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/CY.BLL.pdb">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/CY.Config.dll">
-      <publishTime>04/14/2021 15:49:08</publishTime>
+      <publishTime>09/03/2021 13:49:04</publishTime>
     </File>
     <File Include="bin/CY.Config.pdb">
-      <publishTime>04/14/2021 15:49:08</publishTime>
+      <publishTime>09/03/2021 13:49:04</publishTime>
     </File>
     <File Include="bin/CY.IBaseDAL.dll">
-      <publishTime>04/14/2021 15:49:08</publishTime>
+      <publishTime>09/03/2021 13:49:04</publishTime>
     </File>
     <File Include="bin/CY.IBaseDAL.pdb">
-      <publishTime>04/14/2021 15:49:08</publishTime>
+      <publishTime>09/03/2021 13:49:04</publishTime>
     </File>
     <File Include="bin/CY.IDAL.dll">
-      <publishTime>06/15/2021 09:33:13</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.IDAL.pdb">
-      <publishTime>06/15/2021 09:33:13</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.Infrastructure.dll">
       <publishTime>04/14/2021 15:49:08</publishTime>
@@ -74,46 +74,46 @@
       <publishTime>04/14/2021 15:49:08</publishTime>
     </File>
     <File Include="bin/CY.Model.dll">
-      <publishTime>06/15/2021 09:33:12</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.Model.pdb">
-      <publishTime>06/15/2021 09:33:12</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.Pay.dll">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/CY.Pay.pdb">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:28</publishTime>
     </File>
     <File Include="bin/CY.SendMessage.dll">
-      <publishTime>06/15/2021 09:33:12</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.SendMessage.dll.config">
       <publishTime>07/28/2013 12:13:12</publishTime>
     </File>
     <File Include="bin/CY.SendMessage.pdb">
-      <publishTime>06/15/2021 09:33:12</publishTime>
+      <publishTime>09/09/2021 15:34:26</publishTime>
     </File>
     <File Include="bin/CY.SendMessage.XmlSerializers.dll">
-      <publishTime>06/15/2021 09:33:13</publishTime>
+      <publishTime>09/09/2021 15:34:27</publishTime>
     </File>
     <File Include="bin/CY.SQLDAL.dll">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:27</publishTime>
     </File>
     <File Include="bin/CY.SQLDAL.pdb">
-      <publishTime>06/15/2021 09:33:14</publishTime>
+      <publishTime>09/09/2021 15:34:27</publishTime>
     </File>
     <File Include="bin/CY.WebForm.dll">
-      <publishTime>06/15/2021 09:33:16</publishTime>
+      <publishTime>09/09/2021 15:34:30</publishTime>
     </File>
     <File Include="bin/CY.WebForm.pdb">
-      <publishTime>06/15/2021 09:33:16</publishTime>
+      <publishTime>09/09/2021 15:34:30</publishTime>
     </File>
     <File Include="bin/CY_ValidaterHttpModule.dll">
-      <publishTime>04/23/2021 13:44:05</publishTime>
+      <publishTime>09/03/2021 13:49:05</publishTime>
     </File>
     <File Include="bin/CY_ValidaterHttpModule.pdb">
-      <publishTime>04/23/2021 13:44:05</publishTime>
+      <publishTime>09/03/2021 13:49:05</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
       <publishTime>04/02/2013 10:59:51</publishTime>
@@ -5474,7 +5474,7 @@
       <publishTime>04/13/2021 14:25:29</publishTime>
     </File>
     <File Include="Pages/business/DeliverPlanList.aspx">
-      <publishTime>04/30/2021 13:53:49</publishTime>
+      <publishTime>09/06/2021 09:43:41</publishTime>
     </File>
     <File Include="Pages/business/DeliverPlanPrint.aspx">
       <publishTime>04/29/2021 14:48:58</publishTime>
@@ -5606,13 +5606,13 @@
       <publishTime>05/12/2021 16:48:04</publishTime>
     </File>
     <File Include="Pages/business/OrderListBatchOperation.aspx">
-      <publishTime>05/07/2021 16:57:08</publishTime>
+      <publishTime>09/06/2021 13:45:31</publishTime>
     </File>
     <File Include="Pages/business/OrderOperate.aspx">
       <publishTime>05/08/2014 16:17:48</publishTime>
     </File>
     <File Include="Pages/business/OrderProdactionList.aspx">
-      <publishTime>04/27/2021 15:59:26</publishTime>
+      <publishTime>09/06/2021 09:43:31</publishTime>
     </File>
     <File Include="Pages/business/OrderProdactionListchejian.aspx">
       <publishTime>04/27/2021 11:17:21</publishTime>
@@ -5918,7 +5918,7 @@
       <publishTime>07/28/2013 12:13:55</publishTime>
     </File>
     <File Include="Pages/common/UCPager.ascx">
-      <publishTime>11/21/2013 14:55:07</publishTime>
+      <publishTime>09/06/2021 09:55:33</publishTime>
     </File>
     <File Include="Pages/common/UIPrintTypeList.ascx">
       <publishTime>05/08/2014 16:17:40</publishTime>
@@ -6002,7 +6002,10 @@
       <publishTime>05/14/2014 10:03:52</publishTime>
     </File>
     <File Include="Pages/financial/OrderFinancial.aspx">
-      <publishTime>05/08/2014 16:17:38</publishTime>
+      <publishTime>09/03/2021 13:19:57</publishTime>
+    </File>
+    <File Include="Pages/financial/OrderFinancialPrint.aspx">
+      <publishTime>09/03/2021 13:22:25</publishTime>
     </File>
     <File Include="Pages/financial/OrderMoneyBatchReceive.aspx">
       <publishTime>04/16/2021 09:32:46</publishTime>
@@ -8201,7 +8204,7 @@
       <publishTime>07/28/2013 12:13:36</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/21/2021 15:22:36</publishTime>
+      <publishTime>09/03/2021 13:49:11</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1