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

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java

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

@@ -16,8 +16,10 @@ public class GetFreeBusyListReq {
     private String startDate;
     @ApiModelProperty(value = "结束时间",required = true)
     private String endDate;
-    @ApiModelProperty("加盟商用户ID")
+    @ApiModelProperty("线索id(C端使用)")
+    private String lineId;
+    @ApiModelProperty("加盟商用户ID（C端使用，与面试官id两个字段中必传一个,该字段传值时，线索id必传）")
     private String partnerId;
-    @ApiModelProperty("面试官ID(如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)")
+    @ApiModelProperty("面试官ID(B端使用,如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)")
     private String interviewerId;
 }