Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-06 2b4511ca363e74343e1cb678c23a9e7638800a3f

 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java

@@ -45,8 +45,8 @@

    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");

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

        List<CouponStuAvailableVo> availableVos = new ArrayList<>();