From f499d1827b5fe9b031f72ee389fb2212a8f15f2e Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 17 Nov 2025 13:17:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BE=85=E5=8A=9E=E7=BC=B4=E7=BA=B3?= =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E8=B4=B9=E7=94=A8=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=9F=E5=93=81=E7=89=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/vo/desk/PreparationCommonPendingVO.java | 3 +++ .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 1 + 2 files changed, 4 insertions(+) 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);