Merge branch 'cc20240703_prefried' into 'master'

Cc20240703 prefried

See merge request hangzhou/java/custom_zxjp!127

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

@@ -26,6 +26,7 @@ public enum FileTypeEnum {
     IMPORT_FITMENT_SHOP_STAGE("importFitmentShopStage", "导入装修阶段完成数据"),
     IMPORT_FITMENT_SHOP_STAGE_DATA_ERROR_LIST("OaOldShopStageDataErrorList", "导入装修阶段完成数据错误列表 "),
     SELLING_DETAILS_REPORT("sellingDetailsReport", "开店明细报表"),
+    PRE_FRY_QUALIFICATION_APPLY_EXPORT("preFryQualificationApplyExport", "预炸品资质申请导出"),
     ;
     private String fileType;
     private String desc;

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

@@ -11,7 +11,8 @@ public enum JoinModeEnum {
     FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
     OWN_STORE(3,"加盟公司自有店"),
     STRONG_FRANCHISE(4,"强加盟"),
-    DIRECT_SALES_TO_JOINING(5,"老店转加盟")
+    DIRECT_SALES_TO_JOINING(5,"老店转加盟"),
+    AFFILIATES(6,"联营店")
     ;
     private int code;
     private String desc;