合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java

@@ -76,8 +76,12 @@
    
    @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")
    private BigDecimal servuceShopCharges;