Merge branch 'master' into cc_20250529_login

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

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;