Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 8ad5a84a2675d85977cbfb6020f4905f4dd8090a

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

@@ -11,6 +11,7 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;

/**
 * <p>
@@ -94,7 +95,11 @@

    @ApiModelProperty(value = "获取返佣积分上级类型（1=直推上级，2=直帮上级）")
    @TableField("superior_type")
    private Integer superiorType;
    private String superiorType;

    @ApiModelProperty(value = "获取分佣金额上级类型（1=直推上级，2=直帮上级）")
    @TableField("superior_price_type")
    private String superiorPriceType;

    @ApiModelProperty(value = "核销门店可获得服务费")
    @TableField("servuce_shop_charges")
@@ -124,5 +129,12 @@
    @TableField("bound_shop_superiors_points")
    private Integer boundShopSuperiorsPoints;

    @ApiModelProperty(value = "vip名子")
    @TableField(exist = false)
    private String vipName;

    @TableField(exist = false)
    private List<GoodsArea> goodsAreaList;


}