Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java

@@ -74,4 +74,8 @@ public class HyPartnerBaseInfoDO implements Serializable {
 
     @ApiModelProperty("更新时间")
     private Date updateTime;
+
+    private Date passTime;
+
+    private String passUserId;
 }

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

@@ -24,4 +24,6 @@ public class InterviewDetailInfoVO {
     private Long lineId;
     @ApiModelProperty("面试开始时间")
     private Date startTime;
+
+    private Long interviewPlanId;
 }

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

@@ -58,7 +58,7 @@ public class PartnerLineInfoAndBaseInfoVO {
     private String passCause;
 
     @ApiModelProperty("通过时间")
-    private Date passTime;
+    private String passTime;
 
     @ApiModelProperty("通过人名称")
     private String passUserName;

coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 public class GetFreeBusyListVO {
 
-    @ApiModelProperty("日期列表（默认七天,只有请求参数中查询日期不传时才会返回，否则不返回）")
+    @ApiModelProperty("忙闲列表")
     private List<CalendarInfo> calendarList;
 
 }