Merge branch 'cc_20251114_minor_req' into 'master'

fix:待办缴纳加盟费用列表新增加盟品牌字段

See merge request hangzhou/java/custom_zxjp!191

coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java

@@ -56,4 +56,7 @@ public class PreparationCommonPendingVO {
 
     @ApiModelProperty("签约人2姓名")
     private String partnershipSignatorySecond;
+
+    @ApiModelProperty("加盟品牌")
+    private String franchiseBrand;
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java

@@ -725,6 +725,7 @@ public class DeskServiceImpl implements DeskService {
             preparationCommonPendingVO.setShopManagerUserName(userNameMap.getOrDefault(shopInfoDO.getShopManagerUserId(), ""));
             preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(shopInfoDO.getRegionId(), ""));
             preparationCommonPendingVO.setUpdateTime(x.getUpdateTime());
+            preparationCommonPendingVO.setFranchiseBrand(shopInfoDO.getFranchiseBrand());
             list.add(preparationCommonPendingVO);
         });
         result.setList(list);