Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 8aa510ea43af4f4e36f226900ff653e78731688f

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

@@ -1,5 +1,6 @@
package com.ruoyi.other.vo;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.other.api.domain.ShopPoint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,5 +36,5 @@
    @ApiModelProperty("下级门店返佣积分")
    private Integer subShopCommissionPoint;

    private List<ShopPoint> shopPointList;
    private IPage<ShopPoint> shopPointIPage;
}