From a8b3cae53ac119557a8d5dbd95ad0a4f6a49a5ed Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 3 Jul 2025 14:40:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(CuMemberVO):=20=E4=BC=9A=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzs/member/base/vo/CuMemberVO.java    | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java
index a5b91ed4..488f4559 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java
@@ -47,11 +47,35 @@ public class CuMemberVO implements Serializable {
      */
     @Excel(name = "会员姓名")
     private String memberName;
+
+    /**
+     * 结算等级
+     */
+    @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE)
+    private Integer pkSettleGrade;
+    @Excel(name = "结算等级")
+    private String pkSettleGradeVal;
+
+    /**
+     * 荣誉奖衔
+     */
+    @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
+    private Integer pkMaxAwards;
+
+    @Excel(name = "荣誉奖衔")
+    private String pkMaxAwardsVal;
+
+    /**
+     * 隶属体系
+     */
+    @Excel(name = "隶属体系")
+    private String vertexName;
+
     /**
      * 会员昵称
      */
-    @Excel(name = "会员昵称")
-    private String nickName;
+//    @Excel(name = "会员昵称")
+//    private String nickName;
     /**
      * 联系方式
      */
@@ -87,14 +111,7 @@ public class CuMemberVO implements Serializable {
 
     @Excel(name = "真实奖衔")
     private String pkAwardsVal;
-    /**
-     * 荣誉奖衔
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
-    private Integer pkMaxAwards;
 
-    @Excel(name = "荣誉奖衔")
-    private String pkMaxAwardsVal;
     /**
      * 历史荣誉
      */
@@ -134,13 +151,6 @@ public class CuMemberVO implements Serializable {
     @Excel(name = "注册等级")
     private String pkRegisterGradeVal;
 
-    /**
-     * 结算等级
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE)
-    private Integer pkSettleGrade;
-    @Excel(name = "结算等级")
-    private String pkSettleGradeVal;
     /**
      * 消费金额 注册金额
      */
@@ -154,11 +164,7 @@ public class CuMemberVO implements Serializable {
     @BigDecimalFormat
     @Excel(name = "注册业绩")
     private BigDecimal consumeAchieve;
-    /**
-     * 隶属体系
-     */
-    @Excel(name = "隶属体系")
-    private String vertexName;
+
     /**
      * 隶属团队
      */