Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-16 33a47eef5b24737a8037e52ea3e49588e7df8d52

 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;
}