Merge branch 'master' into dev/feat/partner1.4_20231009

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java

@@ -29,4 +29,6 @@ public class ExcelErrorConstants {
 
     public static final String  COUNT_MORE = "每次数据最多导入500条，请分批上传";
 
+    public static final String  MOBILE_REPEAT = "手机号重复";
+
 }

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -68,6 +68,7 @@ public enum ErrorCodeEnum {
     NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null),
     PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null),
     MOBILE_EXIST(500015, "此手机号码已存在，请修改后重试", null),
+    INVESTMENT_MANAGER_NOT_EXIST(500016, "当前招商经理不存在", null),
 
     INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
     DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),
@@ -84,11 +85,15 @@ public enum ErrorCodeEnum {
     INTERVIEW_LINE_ID_IS_NULL(1021113, "线索id为空！", null),
     INTERVIEW_INTERVIEW_TIME_IS_UNUSABLE(1021114, "当前预约时间不可用，请和线索用户协商其他时间后确定预约时间\n面试人：{0} 手机号：{1}", null),
     INTERVIEW_PARTNER_NOT_EXIST(1021115, "线索下的加盟商不存在！", null),
+    INTERVIEW_STATUS_NOT_TRANSFER(1021116, "当前面试状态不允许转让！ 面试状态:{0}", null),
+
     ROOM_STATUS_ERROR(10211156, "当前面试房间状态不允许进行该操作！", null),
     MOBILE_APP_NOT_ONLINE_ERROR(10211157, "呼叫失败，请确认呼出号码正确并检查是否安装并打开呼叫插件", null),
     CALL_RECORD_NOT_EXIST_ERROR(10211158, "通话记录不存在！", null),
     CALL_UP_ERROR(10211159, "拨出电话异常！", null),
     CREATE_CALL_REQUEST_ERROR(10211160, "创建电话请求失败！", null),
+
+    CREATE_APPOINTMENT_TIME_ERROR(10211161, "当前时间不可预约面试，请选择其他时间", null),
     CONTENT_DUPLICATED(10211200, "动态标题重复！", null),
     SIGN_FAIL(600000, "验签失败", null),
     GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null),

coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java

@@ -15,7 +15,7 @@ public enum FeiShuNoticeMsgEnum {
     BATCH_TRANS_INVESTMENT_MANAGER("收到新线索", "有{0}条新线索于 {1} 转让给您，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"),
     INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人 {0} 手机号 {1} 于 {2} 提交加盟意向申请，请及时处理", "img_v2_c909097d-67d1-4c11-a911-a2584b67ca6g"),
     FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"),
-    INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"),
+    INTERVIEW_APPOINTMENT("面试预约申请", "您有一个【面试预约申请】待处理，预约人 {0}  手机号 {1} ，预约面试时间 {2} ","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"),
     ;
 
     private String title;