From 4b7ec00811bf2db8902d6b64244c8c39ead7e7bd Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Fri, 19 Jan 2024 14:10:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=9D=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=8C=96=E5=B1=9E=E6=80=A7=E7=9A=84=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/PlatformSDK/JDBusiness.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 1f500d51..e3096825 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/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)
                             {

From a354f9246449da89eb6b1a4548e26ee7a2fae638 Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Fri, 19 Jan 2024 16:42:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=92=9A=E5=92=9Adll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InDll2/sendPhone.dll | Bin 105984 -> 105984 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/InDll2/sendPhone.dll b/InDll2/sendPhone.dll
index 50247e46ec58ca35b573370e39a91fa56a93e3d2..d5fe47556dff5d41cb882f9fc45d985944090e18 100644
GIT binary patch
delta 129
zcmZqJ!`85eZNd-cX(Fo{e{cQGxW$##*woO{X!{m7#sV2@pl~V!5HJC80ucL@GBWsN
zG6Go)3@|w!AX@~8*8t_#AmpaUCo@Wd%-vp{%y^YmAmRO=YQrT9T^F93bG2j-cm4K+
IOvVK!0BwRMx&QzG

delta 129
zcmZqJ!`85eZNd-clW~h0e{cQGxW$##)XdPpVEYy~#sV2@pl~V!5HJC80ucL@GBWsN
zG6Go)3@|w!AX@~8*8t_#AmpaUCo@Wd%-vp{%y^YmK+~ZhBDPY_dy@J!#Y*j+S=$pb
I85fuU0M^eX%K!iX


From 5a1d20ddabf49a2760c98460f757347ce359a04d Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Fri, 19 Jan 2024 16:46:53 +0800
Subject: [PATCH 3/3] 10231

---
 BBWY.Client/BBWY.Client.csproj | 2 +-
 BBWY.Client/GlobalContext.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/BBWY.Client.csproj b/BBWY.Client/BBWY.Client.csproj
index 6994eb7e..dc02d1e7 100644
--- a/BBWY.Client/BBWY.Client.csproj
+++ b/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>
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index fed131bf..ef199a45 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10230";
+            ClientVersion = "10231";
         }