Merge branch 'refs/heads/master' into cc_20250529_franchise_fee

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

@@ -259,6 +259,10 @@ public enum ErrorCodeEnum {
     EXPORT_LIMIT_5000(151008,"导出数据不能超过5000条，请增加筛选条件，减少导出数量",null),
     REGION_INTERSECTION_IS_NULL(151011,"所选所属大区/分公司，不在所选集团下",null),
     CHECK_PAYER_ERROR(151012,"缴费人必须是签约人,请重新填写！",null),
+    STORE_INFO_INSUFFICIENT(151013,"门店信息不全，无法前往猎聘注册门店！",null),
+    USER_ACCOUNT_WAIT_AUDIT(151015, "账号信息等待审核",null),
+    SHOP_HAVE_NOT_OVER_ACCORDING(1511014,"该加盟商下有未结束跟进的门店，请先结束门店",null),
+    MOBILE_NOT_EXIST(151016,"手机号不存在，请先维护手机号！",null),
     ;
 
 

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

@@ -23,6 +23,8 @@ public enum FileTypeEnum {
     ZXJP_OPEN_SHOP_REPORT("zxjpOpenShopReport","正新鸡排开店"),
     IMPORT_OA_OLD_SHOP_STAGE_DATA("importOaOldShopStageData", "导入OA旧阶段数据"),
     IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"),
+    IMPORT_FITMENT_SHOP_STAGE("importFitmentShopStage", "导入装修阶段完成数据"),
+    IMPORT_FITMENT_SHOP_STAGE_DATA_ERROR_LIST("OaOldShopStageDataErrorList", "导入装修阶段完成数据错误列表 "),
     ;
     private String fileType;
     private String desc;