Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/BBWY.Client.csproj

@@ -1,7 +1,7 @@
     <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\Images\bbwylogo.ico</ApplicationIcon>

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10230";
+            ClientVersion = "10231";
         }
 
 

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -1114,7 +1114,8 @@ namespace BBWY.Server.Business
                             var tempDataJarray = JArray.Parse(res.Json["jingdong_category_read_findSaleAttrTemplates_responce"]["categoryAttrTemplates"]["templateData"].ToString());
                             var colorProperty = tempDataJarray.FirstOrDefault(j => (j.Value<string>("name") == "颜色" ||
                                                                                    j.Value<string>("name") == "规格" ||
-                                                                                   j.Value<string>("name") == "类别") &&
+                                                                                   j.Value<string>("name") == "类别" ||
+                                                                                   j.Value<string>("name") == "香型") &&
                                                                                    j["attrValueList"].Children().Count() > 0);
                             if (colorProperty == null)
                             {