Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

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

@@ -52,6 +52,10 @@
    @TableField("vip_withdrawal_role")
    private Integer vipWithdrawalRole;

    @ApiModelProperty(value = "钱包提现权限:1开0关")
    @TableField("vip_agent_level_up_role")
    private Integer vipAgentLevelUpRole;

    @ApiModelProperty(value = "最低提现门槛")
    @TableField("vip_withdrawal_min_amount")
    private BigDecimal vipWithdrawalMinAmount;
@@ -146,4 +150,5 @@
    private List<Goods> goodsList;



}