Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-10 4ad0fc5f949708ee4dbd56c0db74673e8dc8040a

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

@@ -131,5 +131,9 @@
    @TableField("keep_shop_point")
    private Integer keepShopPoint;

    @ApiModelProperty(value = "会员等级是否必须达到代理： 0-否 1-是")
    @TableField("vip_level_up_proxy_role")
    private Integer vipLevelUpProxyRole;


}