Merge branch 'master' into cc_sign_20250507

coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java

@@ -3,6 +3,8 @@ package com.cool.store.vo.desk;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author suzhuhong
  * @Date 2024/5/7 10:48
@@ -21,6 +23,8 @@ public class PreparationCommonPendingVO {
     private String shopAddress;
     @ApiModelProperty("督导")
     private String investmentManager;
+    @ApiModelProperty("督导id")
+    private String investmentManagerId;
     @ApiModelProperty("加盟商名称")
     private String partnerName;
     @ApiModelProperty("手机号")
@@ -39,5 +43,9 @@ public class PreparationCommonPendingVO {
     private Long shopId;
     @ApiModelProperty("提交时间")
     private String submitTime;
+    @ApiModelProperty("门店类型")
+    private Integer  storeType;
+    private Long regionId;
+    private Date updateTime;
 
 }