Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-16 1e2308326c98c1d95b3d75ab1cac80bb6f828344

 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("优惠金额")