From 8bd65ed0eab661b4d76c26650be445686f889ca5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 4c8f0ed..7ba00b0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -74,6 +74,14 @@
     R<SysUser>  queryUserByUserName(@RequestBody String userName);
     
     /**
+     * 通过账号和账号权限查询用户
+     * @param userName
+     * @return
+     */
+    @PostMapping("/user/queryUserByUserNameAndRoleType")
+    R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType);
+    
+    /**
      * 新增加用户信息
      * @param user
      */
@@ -88,4 +96,24 @@
      */
     @PostMapping("/user/resetPassword")
     R resetPassword(@RequestBody SysUser user);
+    
+    
+    /**
+     * 新增加门店员工账号数据
+     * @param user
+     * @return
+     */
+    @PostMapping("/user/saveShopUser")
+    R<Long> saveShopUser(@RequestBody SysUser user);
+
+    /**
+     * 删除门店所有管理员账号
+     * @param objectId
+     * @param roleType
+     * @return
+     */
+    @PostMapping("/user/user/delShopUser")
+    R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType);
+
+
 }

--
Gitblit v1.7.1