From 83988f934fc102a4c792d41872a5e4c51066804e Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sat, 3 Aug 2024 13:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=97=E9=93=BA=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=8F=8A=E5=9C=B0=E5=9D=80=EF=BC=8C=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=97=E9=93=BA=E5=9B=BE=E6=A0=87=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E5=BA=97=E9=93=BA=E5=9B=BE=E6=A0=87=E8=A6=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E7=94=A8=E4=BD=9C=E5=BA=97=E9=93=BA=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/hiver/mall/controller/ShopController.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
index 337e6965..b6245094 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
@@ -291,8 +291,9 @@ public class ShopController {
             return ResultUtil.error("店铺id不能为空");
         }
         final Shop oldShop = shopService.get(id);
-        if(shop.getShopIcon() != null){
-            oldShop.setShopIcon(shop.getShopIcon());
+        // 20240803 不更新店铺图标，可更新店铺地址
+        if(shop.getShopAddress() != null){
+            oldShop.setShopAddress(shop.getShopAddress());
         }
         if(shop.getRemark() != null){
             oldShop.setRemark(shop.getRemark());