diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java index bd6463823..7a45da8ce 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java +++ b/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; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 38adb09b6..f48912741 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/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);