Merge branch 'master' into cc_20250211_v2.6

# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java

coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java

@@ -54,7 +54,7 @@ public class ExportBranchShopDTO {
     @ColumnWidth(30)
     private String firstYearStartTime;
 
-    @ExcelProperty(value = "第一年加盟结束时间",order = 10)
+    @ExcelProperty(value = "第一年管理费到期时间",order = 10)
     @ColumnWidth(30)
     private String firstYearEndTime;