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; /** * 省显示