From dce5ad6069ba56c54304d3097ba37a65805edeec Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期三, 24 二月 2021 10:24:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnApi
---
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index 6d9dbb1..d5d9e59 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,17 +157,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
-<<<<<<< HEAD
- <publishTime>02/22/2021 09:56:46</publishTime>
+ <publishTime>02/22/2021 22:22:40</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/22/2021 09:56:46</publishTime>
-=======
- <publishTime>02/21/2021 11:56:27</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>02/21/2021 11:56:27</publishTime>
->>>>>>> parent of 9ba27cd (nothing)
+ <publishTime>02/22/2021 22:22:40</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -287,65 +280,61 @@
<publishTime>01/24/2021 15:32:22</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>02/22/2021 09:23:05</publishTime>
+ <publishTime>02/05/2021 20:24:19</publishTime>
</File>
<File Include="Web.config">
-<<<<<<< HEAD
- <publishTime>02/22/2021 09:57:03</publishTime>
-=======
- <publishTime>02/21/2021 12:21:03</publishTime>
->>>>>>> parent of 9ba27cd (nothing)
+ <publishTime>02/22/2021 22:22:51</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1