From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopRelUserService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopRelUserService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopRelUserService.java
index ff3cf10..73c4fb0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopRelUserService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopRelUserService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.shop.service.shop;
 
-import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@
      * @param userId
      * @return
      */
-    ShopRelUser getByUserId(Long userId);
+    List<ShopRelUser> getByUserId(Long userId);
 
     /**
      * 通过用户id删除关联

--
Gitblit v1.7.1