Merge branch 'cc_20250513_franchise_report' into 'master'

Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!82

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

@@ -148,7 +148,7 @@ public enum ErrorCodeEnum {
     LINE_ALREADY_EXISTS(10211163, "该线索已存在，跟进人为{0}", null),
     LINE_EXISTS_IN_PUBLIC_SEA(10211164, "该线索已存在，请前往公海认领", null),
     CONTENT_DUPLICATED(10211200, "动态标题重复！", null),
-    SIGN_FAIL(600000, "验签失败", null),
+    SIGN_FAIL(600000, "验签失败=>{0}", null),
     GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null),
     NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null),
     INSPECTION_USER_OCCUPY(600003,"当前稽核人已经配置其他战区",null),
@@ -195,7 +195,7 @@ public enum ErrorCodeEnum {
     AUDIT_RESULT_FALSE(109012, "意向加盟合同API本次调用结果与上一次不一致", null),
 
 
-    TIME_NULL_FALSE(109013, "有时间为空", null),
+    TIME_NULL_FALSE(109013, "完成时间不能为空", null),
 
     UNISSUED_STATEMENT_2(109014, "该门店已发布账单", null),
 
@@ -257,6 +257,7 @@ public enum ErrorCodeEnum {
 
     BANK_EXIST(151007,"当前银行已存在，请直接选择！",null),
     EXPORT_LIMIT_5000(151008,"导出数据不能超过5000条，请增加筛选条件，减少导出数量",null),
+    REGION_INTERSECTION_IS_NULL(151011,"所选所属大区/分公司，不在所选集团下",null),
     ;
 
 

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

@@ -20,7 +20,9 @@ public enum FileTypeEnum {
     EXPORT_PROGRESS("exportProgress","进度确认"),
     IMPORT_OA_OLD_SHOP_DATA_ERROR("OaOldShopDataError", "导入OA旧数据错误列表"),
     IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"),
-
+    ZXJP_OPEN_SHOP_REPORT("zxjpOpenShopReport","正新鸡排开店"),
+    IMPORT_OA_OLD_SHOP_STAGE_DATA("importOaOldShopStageData", "导入OA旧数据"),
+    IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"),
     ;
     private String fileType;
     private String desc;