From 7f959107da2e55296b8776b99b13f14c4faef478 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Tue, 24 Jun 2025 17:52:14 +0800
Subject: [PATCH] no message

---
 .../java/com/ghy/web/controller/goods/GoodsController.java    | 2 ++
 ghy-goods/pom.xml                                             | 4 ++++
 ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java       | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
index 1b4e96b2..668b936a 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
@@ -379,6 +379,8 @@ public class GoodsController extends BaseController {
         try {
             Goods result = goodsService.selectById(goods.getGoodsId());
 
+            Shop shop=shopService.getShop(result.getShopId());
+            result.setShop(shop);
             // 补全商品类目及父级类目信息
             GoodsCategory goodsCategory = goodsCategoryService.selectById(result.getDeptGoodsCategoryId());
             result.setDeptGoodsCategoryName(goodsCategory.getGoodsCategoryName());
diff --git a/ghy-goods/pom.xml b/ghy-goods/pom.xml
index 13f47887..ebe918f9 100644
--- a/ghy-goods/pom.xml
+++ b/ghy-goods/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.ghy</groupId>
             <artifactId>ghy-custom</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ghy</groupId>
+            <artifactId>ghy-shop</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index bfda9bf4..d5a5a57c 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -2,6 +2,7 @@ package com.ghy.goods.domain;
 
 import com.ghy.common.annotation.Excel;
 import com.ghy.common.core.domain.BaseEntity;
+import com.ghy.shop.domain.Shop;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -113,5 +114,6 @@ public class Goods extends BaseEntity {
     @Excel(name = "到店服务")
     private Integer storeService;
 
-    
+
+    private Shop shop;
 }