Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-22 490db2e9cc769bd0aa3571fad345c7a01bc01bdd

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java

@@ -38,10 +38,12 @@
    @ApiModelProperty(value = "剩余充电次数")
    @TableField("charge_num")
    private Integer chargeNum;



    @ApiModelProperty(value = "购买时折扣金额")
    
    @ApiModelProperty(value = "折扣")
    @TableField("discount")
    private BigDecimal discount;
    
    @ApiModelProperty(value = "最高优惠金额")
    @TableField("discount_money")
    private BigDecimal discountMoney;