Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 893c8ad4d5d55f35c8499c007ce028bc43c6bf9f

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipSetting.java

@@ -55,6 +55,10 @@
    @TableField("vip_withdrawal_min_amount")
    private BigDecimal vipWithdrawalMinAmount;

    @ApiModelProperty(value = "提现手续费")
    @TableField("vip_withdrawal_fee")
    private BigDecimal vipWithdrawalFee;

    @ApiModelProperty(value = "积分转赠权限 1开0关")
    @TableField("vip_gift_role")
    private Integer vipGiftRole;