合并代码

puzhibing

2024-12-27 a323bb6fbfdd9fa7bc03465b7fbed2baf6d0fa84

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

@@ -98,9 +98,9 @@
    @TableField("shop_all_point")
    private Integer shopAllPoint;

    @ApiModelProperty(value = "门店业绩积分")
    @TableField("shop_point")
    private Integer shopPoint;
    @ApiModelProperty(value = "绑定下级门店分佣积分")
    @TableField("lower_level_share_point")
    private Integer lowerLevelSharePoint;

    @ApiModelProperty(value = "门店返佣积分")
    @TableField("share_point")
@@ -118,6 +118,9 @@
    @TableField("lave_point")
    private Integer lavePoint;

    @TableField(exist = false)
    private Integer laveUsePoint;

    @ApiModelProperty(value = "门店分佣总金额")
    @TableField("giveaway_all_money")
    private BigDecimal giveawayAllMoney;