Merge branch 'cc_20250513_franchise_report' into 'master'

Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!84

coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java

@@ -72,7 +72,7 @@ public class ZxjpApiRequest {
     @ApiModelProperty(value = "所属督导")
     private String  shopSupervisorUserName;
 
-    @ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）")
+    @ApiModelProperty(value = "加盟模式（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）")
     private Integer joinMode;
 
     @ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）")

coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Author: WangShuo
@@ -89,6 +90,9 @@ public class FranchiseReportResponse {
     private Integer yesterdayStoreNum = 0;
     @ExcelIgnore
     private Long regionId;
+    //集团维度使用
+    @ExcelIgnore
+    private List<Long> regionIds;
 
 
 }