From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoExtraVO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoExtraVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoExtraVO.java
index a8183a3..4169d5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoExtraVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoExtraVO.java
@@ -5,16 +5,15 @@
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.entity.bus.user.UserRank;
public class UserInfoExtraVO extends UserInfoExtra implements Serializable {
private static final long serialVersionUID = 1L;
- // 绯荤粺绛夌骇鍒楄〃
+ // 绯荤粺绛夌骇鍒楄〃鍥剧墖
@Expose
- private List<UserRank> listRank;
+ private String rankContrast;
// 绯荤粺鐗瑰埆鎻愰啋
@Expose
private String rankTip;
@@ -37,12 +36,13 @@
this.galaMsg = galaMsg;
}
- public List<UserRank> getListRank() {
- return listRank;
+
+ public String getRankContrast() {
+ return rankContrast;
}
- public void setListRank(List<UserRank> listRank) {
- this.listRank = listRank;
+ public void setRankContrast(String rankContrast) {
+ this.rankContrast = rankContrast;
}
public int getOrderNumSelf() {
--
Gitblit v1.8.0