diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 16b6f432..dd8432cf 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
-
+
diff --git a/BBWY.Server.Business/MDSBusiness.cs b/BBWY.Server.Business/MDSBusiness.cs
index 6eac3699..1b4e5dc0 100644
--- a/BBWY.Server.Business/MDSBusiness.cs
+++ b/BBWY.Server.Business/MDSBusiness.cs
@@ -43,7 +43,7 @@ namespace BBWY.Server.Business
AppSecret = shopJToken.Value("AppSecret"),
AppToken = shopJToken.Value("AppToken"),
PlatformId = (Enums.Platform)shopJToken.Value("PlatformId"),
- VenderType = shopJToken.Value("ShopType"),
+ ShopType = shopJToken.Value("ShopType"),
ShopId = shopId.ToString(),
ShopName = shopJToken.Value("ShopName"),
ManagePwd = shopJToken.Value("ManagePwd")
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index e0ca6f11..b0cdd75b 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -927,7 +927,7 @@ namespace BBWY.Server.Business
PageIndex = 1,
PageSize = 100,
Platform = shop.PlatformId,
- JDColType = string.IsNullOrEmpty(shop.VenderType) ? "0" : shop.VenderType,
+ JDColType = string.IsNullOrEmpty(shop.ShopType) ? "0" : shop.ShopType,
SaveResponseLog = true,
OrderId = orderId
}, null, HttpMethod.Post);
diff --git a/BBWY.Server.Business/Vender/VenderBusiness.cs b/BBWY.Server.Business/Vender/VenderBusiness.cs
index 7fa4fbdf..3fffa115 100644
--- a/BBWY.Server.Business/Vender/VenderBusiness.cs
+++ b/BBWY.Server.Business/Vender/VenderBusiness.cs
@@ -190,7 +190,7 @@ namespace BBWY.Server.Business
PlatformCommissionRatio = x.PlatformCommissionRatio,
ShopId = x.ShopId,
ShopName = x.ShopName,
- VenderType = x.ShopType
+ ShopType = x.ShopType
}).ToList()
};
departmentList.Add(department);
diff --git a/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs b/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs
index 3324e336..4a48bcd0 100644
--- a/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs
@@ -15,7 +15,7 @@ namespace BBWY.Server.Model.Dto
///
/// 商家类型
///
- public string VenderType { get; set; }
+ public string ShopType { get; set; }
///
/// 店铺平台