From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/msg/TokenVO.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/TokenVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/TokenVO.java
index 558cba3..2b611b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/TokenVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/TokenVO.java
@@ -7,7 +7,7 @@
public class TokenVO {
@Expose // id
- private Long id;
+ private String token;
@Expose // 鏄电О
private String nickName;
@@ -15,8 +15,8 @@
@Expose // 澶村儚
private String portrait;
- @Expose // 绫诲瀷
- private String type;
+ @Expose // 绫诲瀷 1鏍囬鎼滅储 2閾炬帴鎼滅储
+ private Integer type;
@Expose // 鏁伴噺銆侀潰棰�
private Integer amount;
@@ -44,11 +44,12 @@
this.portrait = portrait;
}
- public String getType() {
+
+ public Integer getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Integer type) {
this.type = type;
}
@@ -68,12 +69,12 @@
this.tips = tips;
}
- public Long getId() {
- return id;
+ public String getToken() {
+ return token;
}
- public void setId(Long id) {
- this.id = id;
+ public void setToken(String token) {
+ this.token = token;
}
public Boolean getState() {
--
Gitblit v1.8.0