Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 e9085eb620dcae1ceae24bc8b70e1a6bca228b15

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java

@@ -15,7 +15,7 @@
     * 查询注册赠送优惠券 判断当前优惠券限领数量
     */
    @PostMapping("/coupon/queryCouponByUser/{userId}")
    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId);
    public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId);

    @PostMapping("/base/userConpon/getStuOfConpons")
    public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);