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/redpack/RedPackGiveRecord.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackGiveRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackGiveRecord.java index 0785123..66f09e7 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackGiveRecord.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackGiveRecord.java @@ -6,6 +6,8 @@ import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; +import com.google.gson.annotations.Expose; + /** * 绾㈠寘璧犻�佽褰� * @@ -31,18 +33,22 @@ @Column(name = "rpgr_give_uid") private Long giveUid; // 璧犻�佹椂闂� + @Expose @Column(name = "rpgr_give_time") private Date giveTime; // 璧犻�佺粨鏉熸椂闂� @Column(name = "rpgr_end_time") private Date endTime; // 棰嗗彇uid + @Expose @Column(name = "rpgr_receive_uid") private Long receiveUid; // 棰嗗彇鏃堕棿 + @Expose @Column(name = "rpgr_receive_time") private Date receiveTime; // 鐘舵�侊細0鍒濆 1宸查鍙� 2宸查��鍥� + @Expose @Column(name = "rpgr_state") private Integer state; -- Gitblit v1.8.0