Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

@@ -31,10 +31,10 @@
   /**
    * 根据id编辑用户
    */
   @PostMapping("/appUser/editAppUserById")
   @PostMapping("/app-user/editAppUserById")
   R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser);

   @PostMapping("/appUser/getCouponCount")
   @PostMapping("/app-user/getCouponCount")
   R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId );

   /**
@@ -43,4 +43,14 @@
   @GetMapping("/appUserShop/shop/{userId}")
   R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);

   /**
    * 根据用户id获取用户的祖籍列表
    */
   @GetMapping("/appletLogin/getUserAncestorList")
   R<List<AppUser>> getUserAncestorList(@RequestParam("id") Long id);



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