fix 开店管理根据意向区域查询

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

@@ -24,7 +24,7 @@ public class BranchShopRequest  extends PageBasicInfo{
     @ApiModelProperty("督导userId")
     private String investmentManagerUserId;
     @ApiModelProperty("意向开店区域")
-    private Long wantShopAreaId;
+    private List<Long> wantShopAreaId;
     @ApiModelProperty("加盟模式")
     private Integer joinMode;
     @ApiModelProperty("加盟品牌")
@@ -37,5 +37,7 @@ public class BranchShopRequest  extends PageBasicInfo{
     private Date openTimeEnd;
     @ApiModelProperty(value = "管辖区域",hidden = true)
     private List<String> authRegionIds;
+    @ApiModelProperty(value="意向开店区域+子节点",hidden = true)
+    private List<Long> wantShopAreaAllIds;
 
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author: WangShuo
@@ -27,9 +28,9 @@ public class BranchShopResponse {
     @ApiModelProperty("所属大区")
     private String regionName;
     @ApiModelProperty("所属品牌")
-    private String franchiseBrand;
+    private List<Integer> franchiseBrand;
     @ApiModelProperty("加盟模式")
-    private String joinMode;
+    private Integer joinMode;
     @ApiModelProperty("意向开店区域")
     private String wantRegionName;
     @ApiModelProperty("计划开业时间")