Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

 cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java

@@ -15,6 +15,7 @@

    /**
     * 根据id获取用户优惠券数据
     *
     * @param queryUserCouponByIdAndUserId
     * @return
     */
@@ -23,6 +24,7 @@

    /**
     * 修改优惠券数据
     *
     * @param userCoupon
     */
    @PostMapping("/userCoupon/updateUserCoupon")