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/user/UserInfoVO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
index 071aa3c..d6c5116 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
@@ -84,7 +84,7 @@
 	private String tbRelationId;
 	
 	// 鍓╀綑閲戝竵鏁伴噺
-	private Integer goldCoin;
+	private int goldCoin;
 	
 
 	public String getRankId() {
@@ -343,11 +343,11 @@
 		this.tbRelationId = tbRelationId;
 	}
 
-	public Integer getGoldCoin() {
+	public int getGoldCoin() {
 		return goldCoin;
 	}
 
-	public void setGoldCoin(Integer goldCoin) {
+	public void setGoldCoin(int goldCoin) {
 		this.goldCoin = goldCoin;
 	}
 	

--
Gitblit v1.8.0