angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bd_dev' into bd_dev

This commit is contained in:
sangelxiu1 2025-07-03 14:54:10 +08:00
parent ca1a687610 429c39a435
commit 773717e82f
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberVO.java
View File

@ -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;
/**
* 隶属团队
*/