Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -60,7 +60,11 @@ namespace Myshipping.Application
 
 
         #region 上传数据
-
+        /// <summary>
+        /// 同步客户
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         [HttpPost("/DataSync/SyncCustomer"), ApiUser]
         public async Task<long> SyncCustomer(DjyCustomerSyncDto model)
         {
@@ -68,6 +72,17 @@ namespace Myshipping.Application
             return 0;
         }
 
+
+
+
+
+
+
+
+
+
+
+
         #endregion
 
         #region 下载数据

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -779,7 +779,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto)
     {
         var list = await _sysCacheService.GetAllMappingPackage();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module &&x.CarrierCode==dto.CarrierCode && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);