Merge branch 'BaoMaKu' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into BaoMaKu

Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs

@@ -41,7 +41,7 @@ namespace MyCode.Project.Services
         List<BusiOrderGoodsDocInResponse> GetPurchaseInboundData(DateTime now);
 
         /// <summary>
-        /// 获取吉客云采购出库单
+        /// 获取吉客云采购退货出库单
         /// </summary>
         /// <param name="now">截止日期</param>
         /// <returns></returns>

Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs

@@ -52,7 +52,12 @@ namespace MyCode.Project.Services
         /// <param name="now"></param>
         void GetStorageGoodsDocOutV2(string now);
 
-
+        /// <summary>
+        /// 合并吉客云采购订单到新表
+        /// </summary>
+        /// <returns></returns>
+        
+        string GetAndMergePushGoodsDocInOrder(string now);
 
     }
 }