From 9461e45e40e36e3097a6c05b1d861253e987fa77 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 14:24:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
index ecc3f7e..d90e2db 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java
@@ -59,6 +59,9 @@
         if(null != appUserShop.getShopId()){
             wrapper.eq(AppUserShop::getShopId, appUserShop.getShopId());
         }
+        if(null != appUserShop.getRoleType()){
+            wrapper.eq(AppUserShop::getRoleType, appUserShop.getRoleType());
+        }
         appUserShopService.remove(wrapper);
         return R.ok();
     }

--
Gitblit v1.7.1