From 6e1d9164c1adac2763f17c2a297d8fff3ed9ea25 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 25 Jul 2025 10:18:24 +0800
Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E6=94=B6=E7=9B=8A=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/member/base/CuMemberRegionMapper.xml          | 4 +++-
 .../hzs/common/domain/member/ext/CuMemberRegionExt.java  | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
index 0432ce77..98275e29 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
@@ -141,10 +141,12 @@
         pc.name countyVal,
         bg.GRADE_NAME gradeName,
         brv.pk_id as regionVertexPkId,
-        brv.name as regionVertexName
+        brv.name as regionVertexName,
+        ba.AWARDS_NAME as awardsName
         FROM CU_MEMBER_RETAIL_REGION CRR
         INNER JOIN CU_MEMBER CM
         ON CRR.PK_MEMBER = CM.PK_ID
+        INNER JOIN BD_AWARDS ba ON ba.pk_id = cm.PK_AWARDS
         INNER join BD_GRADE bg on bg.pk_id=cm.PK_SETTLE_GRADE
         LEFT JOIN BD_AREA P
         ON P.PK_ID = CRR.PROVINCE
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberRegionExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberRegionExt.java
index 088611b2..9d9fc8f8 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberRegionExt.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberRegionExt.java
@@ -31,8 +31,13 @@ public class CuMemberRegionExt extends CuMemberRegion {
     /**
      * 等级
      */
-    @Excel(name = "等级", sort = 3)
-    private String gradeName;
+//    @Excel(name = "等级", sort = 3)
+//    private String gradeName;
+    /**
+     * 等级
+     */
+    @Excel(name = "奖衔", sort = 3)
+    private String awardsName;
 
     /**
      * 省显示