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

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -122,6 +122,7 @@ namespace Myshipping.Application
                 {
                     entity.CUSTSERVICEID = userlist.Where(x => x.Name == entity.CUSTSERVICE).Count() == 0 ? "" : userlist.Where(x => x.Name == entity.CUSTSERVICE).Select(x => x.Id).FirstOrDefault().ToString();
                 }
+                entity.PropString = entity.PropString.Replace("forwarder", "booking_agent");
                 entity.TenantId = UserManager.TENANT_ID;
                 await _djycustomer.InsertAsync(entity);
                 foreach (var item in model.ContactList)
@@ -151,6 +152,7 @@ namespace Myshipping.Application
                 {
                     entity.CUSTSERVICEID = userlist.Where(x => x.Name == entity.CUSTSERVICE).Count() == 0 ? "" : userlist.Where(x => x.Name == entity.CUSTSERVICE).Select(x => x.Id).FirstOrDefault().ToString();
                 }
+                entity.PropString = entity.PropString.Replace("forwarder", "booking_agent");
                 await _djycustomer.AsUpdateable(entity).IgnoreColumns(it => new
                 {
                     it.TenantId,
@@ -206,7 +208,9 @@ namespace Myshipping.Application
                     if (!string.IsNullOrEmpty(entity.CUSTSERVICE))
                     {
                         entity.CUSTSERVICEID = userlist.Where(x => x.Name == entity.CUSTSERVICE).Count() == 0 ? "" : userlist.Where(x => x.Name == entity.CUSTSERVICE).Select(x => x.Id).FirstOrDefault().ToString();
+
                     }
+                    entity.PropString = entity.PropString.Replace("forwarder", "booking_agent");
                     entity.TenantId = UserManager.TENANT_ID;
                     await _djycustomer.InsertAsync(entity);
                     foreach (var it in item.ContactList)
@@ -236,6 +240,7 @@ namespace Myshipping.Application
                     {
                         entity.CUSTSERVICEID = userlist.Where(x => x.Name == entity.CUSTSERVICE).Count() == 0 ? "" : userlist.Where(x => x.Name == entity.CUSTSERVICE).Select(x => x.Id).FirstOrDefault().ToString();
                     }
+                    entity.PropString = entity.PropString.Replace("forwarder", "booking_agent");
                     await _djycustomer.AsUpdateable(entity).IgnoreColumns(it => new
                     {
                         it.TenantId,