From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/goods/RecommendUserGoods.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/goods/RecommendUserGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/goods/RecommendUserGoods.java
index 1353e1a..29d3dca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/goods/RecommendUserGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/goods/RecommendUserGoods.java
@@ -15,14 +15,23 @@
 public class RecommendUserGoods {
 	@Column(name = "rug_id")
 	private Long id;
+	
 	@Column(name = "rug_uid")
 	private UserInfo user;
+	
+	@Column(name = "rug_device")
+	private String device;
+	
 	@Column(name = "rug_recommend_desc")
 	private String recommendDesc;
+	
 	@Column(name = "rug_create_time")
 	private Date createTime;
+	
 	@Column(name = "rug_update_time")
 	private Date updateTime;
+	
+	
 	private List<CommonGoods> goodsList;
 
 	public Long getId() {
@@ -72,4 +81,12 @@
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public String getDevice() {
+		return device;
+	}
+
+	public void setDevice(String device) {
+		this.device = device;
+	}
 }

--
Gitblit v1.8.0