Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-20 49f2eff2cf52e0f1719dfad43cafff11b378252c

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java

@@ -58,9 +58,27 @@
   @PostMapping("/app-user/getVipCount")
   R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );

   @GetMapping("/app-user/getAppUserByPhone")
    R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);

   @GetMapping("/app-user/listByIds")
   List<AppUser> listByIds(List<String> list);
   List<AppUser> listByIds(@RequestParam("ids") List<Long> list);

   /**
    * 根据用户名称模糊搜索用户列表
    * @param name
    * @return
    */
   @PostMapping("/app-user/getAppUserByName")
   R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);

   /**
    * 根据用户电话模糊搜索用户列表
    * @param phone
    * @return
    */
   @PostMapping("/app-user/getAppUserByPhone")
   R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);


   @PostMapping("/app-user/getAppUserByPhone1")
   R<AppUser> getAppUserByPhone1(String phone);
}