Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-01 e0623f1a914ecbc99d5926c0df3cf26032c02499

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopPointStatistics.java

@@ -7,6 +7,7 @@
import lombok.Data;

import java.util.List;
import java.util.Map;

@Data
@ApiModel("门店积分统计")
@@ -37,4 +38,7 @@
    private Integer subShopCommissionPoint;

    private IPage<ShopPoint> shopPointIPage;

    @ApiModelProperty("折线图数据")
    private Map<String, Object> brokenLine;
}