Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 34eb869e7350173ff036881fc776bc27d5be6d7a

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/CouponWarpper.java

@@ -11,6 +11,8 @@
@Data
@ApiModel
public class CouponWarpper {
    @ApiModelProperty("优惠券id")
    private Integer id;
    @ApiModelProperty("满金额")
    private Double couponConditionalAmount;
    @ApiModelProperty("优惠金额")