From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
index e361c36..21b4c02 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.entity.push;
import java.util.Date;
+import java.util.List;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
@@ -32,7 +33,7 @@
private String picture;
// 鎺ㄩ�佺敤鎴穒d 浣跨敤浜庡崟鎺�
-// @Column(name = "pg_uid")
+ @Column(name = "pg_uid")
private Long uid;
@Column(name = "pg_versions")
@@ -55,7 +56,10 @@
// 缁熻鍟嗗搧鏁伴噺
private Long countGoods;
-
+ // ios鎺ㄩ�佺増鏈�
+ private List<String> listIOS;
+ // Android鎺ㄩ�佺増鏈�
+ private List<String> listAndroid;
public PushGoods(){}
@@ -168,5 +172,20 @@
public void setUid(Long uid) {
this.uid = uid;
}
-
+
+ public List<String> getListIOS() {
+ return listIOS;
+ }
+
+ public void setListIOS(List<String> listIOS) {
+ this.listIOS = listIOS;
+ }
+
+ public List<String> getListAndroid() {
+ return listAndroid;
+ }
+
+ public void setListAndroid(List<String> listAndroid) {
+ this.listAndroid = listAndroid;
+ }
}
--
Gitblit v1.8.0