合并代码

puzhibing

2024-12-10 5f9e42d921ba2b191199e61cf070da20de39758c

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

@@ -105,7 +105,7 @@

    @ApiModelProperty(value = "门店业绩积分")
    @TableField("shop_point")
    private BigDecimal shopPoint;
    private Integer shopPoint;

    @ApiModelProperty(value = "门店业绩积分 1开0关")
    @TableField("shop_point_open")
@@ -129,7 +129,7 @@

    @ApiModelProperty(value = "拉新人积分")
    @TableField("get_new_point")
    private BigDecimal getNewPoint;
    private Integer getNewPoint;

    @ApiModelProperty(value = "拉新人积分 1开0关")
    @TableField("get_new_point_open")