From 2c217c4f9e01bd2e764c7b62da1aaa89018d76d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 12:19:21 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 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 21b4c02..249e895 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
@@ -8,6 +8,11 @@
@Table("yeshi_ec_push_goods")
public class PushGoods {
+
+ // 鎺ㄩ�佺姸鎬侊細 0鏈帹閫� 1鎺ㄩ�佹垚鍔� 2鎺ㄩ�佸け璐�
+ public final static int STATE_INIT = 0;
+ public final static int STATE_SUCCESS = 1;
+ public final static int STATE_FAIL = 2;
@Column(name = "pg_id")
private Long id;
@@ -39,9 +44,17 @@
@Column(name = "pg_versions")
private String versions;
+ // 棰勮鎺ㄩ�佹椂闂�
+ @Column(name = "pg_control_time")
+ private Date controlTime;
+
+ // 澶囨敞
+ @Column(name = "pg_remark")
+ private String remark;
+
// 鏄惁宸叉帹閫�
@Column(name = "pg_is_push")
- private boolean isPush;
+ private Integer isPush;
// 鎺ㄩ�佹椂闂�
@Column(name = "pg_push_time")
@@ -53,6 +66,10 @@
@Column(name = "pg_updatetime")
private Date updateTime;
+ // 鏄惁瀹氭椂
+ private Boolean timeTask;
+ // 瀹氭椂鏃堕棿
+ private String controlTime_str;
// 缁熻鍟嗗搧鏁伴噺
private Long countGoods;
@@ -109,11 +126,11 @@
this.content = content;
}
- public boolean isPush() {
+ public Integer getIsPush() {
return isPush;
}
- public void setPush(boolean isPush) {
+ public void setIsPush(Integer isPush) {
this.isPush = isPush;
}
@@ -188,4 +205,37 @@
public void setListAndroid(List<String> listAndroid) {
this.listAndroid = listAndroid;
}
+
+ public Date getControlTime() {
+ return controlTime;
+ }
+
+ public void setControlTime(Date controlTime) {
+ this.controlTime = controlTime;
+ }
+
+ public Boolean isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(Boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
+ public String getControlTime_str() {
+ return controlTime_str;
+ }
+
+ public void setControlTime_str(String controlTime_str) {
+ this.controlTime_str = controlTime_str;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
}
--
Gitblit v1.8.0