Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-27 2d73575643e28451484a65edc2fa78d404b19cbe

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java

@@ -18,6 +18,7 @@
    private BigDecimal annualCard;
    @ApiModelProperty("最高抵扣价格")
    private BigDecimal maximumDeduction;
    private BigDecimal timeAmount;
    @ApiModelProperty("抵扣次数")
    private Integer discountTimes;