From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期三, 23 四月 2025 18:12:46 +0800 Subject: [PATCH] 前端联调 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java index 28222d3..dc51f49 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsShopController.java @@ -38,6 +38,8 @@ @Resource private ShopService shopService; + + @Resource private GoodsService goodsService; @@ -53,8 +55,10 @@ if (shop == null || shop.getStatus() ==2 || shop.getDelFlag()==1) { return R.ok(); } + one.setShopName(shop.getName()); one.setPhone(shop.getPhone()); + one.setAddress(shop.getAddress()); return R.ok(one); } -- Gitblit v1.7.1