Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6

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

@@ -40,6 +40,9 @@
   @GetMapping("/appUserShop/shop/{userId}")
   R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);

   @PostMapping("/appUserShop/addAppUserShop")
   R<Void> addAppUserShop(@RequestBody AppUserShop appUserShop);

   /**
    * 根据用户id获取用户的祖籍列表
    */
@@ -49,10 +52,15 @@
   @GetMapping("/appletLogin/getSuperiorLeader")
   R<AppUser> getSuperiorLeader(@RequestParam("id") Long id);


   @GetMapping("/app-user/getTopUsers")
   R<List<AppUser>> getTopUsers();

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


   @GetMapping("/app-user/listByIds")
   List<AppUser> listByIds(List<String> list);
   
   /**
    * 根据用户名称模糊搜索用户列表
@@ -69,4 +77,8 @@
    */
   @PostMapping("/app-user/getAppUserByPhone")
   R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
	
	
   @PostMapping("/app-user/getAppUserByPhone1")
   R<AppUser> getAppUserByPhone1(String phone);
}