From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 4251e5f..00fc1bb 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -4,12 +4,12 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.system.domain.dto.*;
 import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
 import com.ruoyi.shop.domain.vo.MgtShopPageVo;
 import com.ruoyi.shop.domain.vo.MgtShopTagVo;
 import com.ruoyi.shop.service.shop.ShopRelTagService;
 import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

--
Gitblit v1.7.1