From 806dc3158dade6c5e1cba4e3d9b76fdaa2159c8f Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Wed, 19 Jul 2023 17:31:33 +0800
Subject: [PATCH] 10152

---
 BBWY.Client/GlobalContext.cs                            | 2 +-
 BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 9d663ef1..66abb93d 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 = "10151";
+            ClientVersion = "10152";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
index 36bd0562..1acce909 100644
--- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
@@ -384,8 +384,9 @@ namespace BBWY.Client.ViewModels.PackTask
                 BarCodeModel.Brand = Brand;
                 BarCodeModel.SkuId = SkuId;
                 BarCodeModel.SkuName = SkuName;
-                BarCodeModel.ShopName = globalContext.User.Shop.ShopName;
+                
             }
+            BarCodeModel.ShopName = globalContext.User.Shop.ShopName;
             if (!string.IsNullOrEmpty(BrandName))
                 BarCodeModel.BrandName = BrandName;