From 786f674a905e684bea9278aebc11551b681c557e Mon Sep 17 00:00:00 2001
From: "feng.li" <fengli@hsayi.com>
Date: Tue, 9 Jan 2024 13:14:17 +0800
Subject: [PATCH] =?UTF-8?q?webc=E7=BA=BF=E7=B4=A2=E5=8F=82=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=9A=E9=94=80=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BC=9A?=
 =?UTF-8?q?=E9=94=80=E7=BB=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/HyExhibitionMapper.xml           | 1 +
 .../com/cool/store/vo/exhibition/PartnerExhibitionListVO.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
index b7a9ae113..6ce15e354 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
@@ -430,6 +430,7 @@
 
   <select id="getPartnerExhibitionList" resultType="com.cool.store.vo.exhibition.PartnerExhibitionListVO">
     SELECT
+      t2.exhibition_group_id AS exhibitionGroupId,
       t2.id AS exhibitionId,
       t2.exhibition_code AS exhibitionCode,
       t2.exhibition_name AS exhibitionName,
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java
index f499c8c22..d1e2cf3b9 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java
@@ -11,6 +11,9 @@ import lombok.Data;
 @Data
 public class PartnerExhibitionListVO {
 
+    @ApiModelProperty("会销组id")
+    private String exhibitionGroupId;
+
     @ApiModelProperty(value = "展会id", example = "123")
     private String exhibitionId;