From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java
index 2998f65..9316dfb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java
@@ -53,6 +53,11 @@
@Column(name = "sgr_title")
private String title;
+ // 鏄惁宸插垎浜� 鐘舵�侊細0鍒濆鍊� 1宸插垎浜�
+ @Expose
+ @Column(name = "sgr_share_state")
+ private Integer shareState;
+
// 鍒嗕韩鏃堕棿
@Column(name = "sgr_createtime")
private Date createTime;
@@ -62,6 +67,7 @@
private Date updateTime;
// 鍒嗕韩鏃堕棿
+ @Expose
private Long shareTime;
@@ -220,5 +226,12 @@
public void setTitle(String title) {
this.title = title;
}
-
+
+ public Integer getShareState() {
+ return shareState;
+ }
+
+ public void setShareState(Integer shareState) {
+ this.shareState = shareState;
+ }
}
--
Gitblit v1.8.0