From f7fc64d5ed3d19e131bc84398ae7e801ff30341e Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 10 九月 2019 15:28:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java index 979b538..ea01ddc 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java @@ -46,6 +46,13 @@ @Column(name = "cgr_state") private Integer state; + // 鍒稿悕绉� + private String couponName; + // 璧犻�佷汉 + private String giveName; + // 棰嗗彇浜� + private String receiveName; + public Long getId() { return id; @@ -118,4 +125,28 @@ public void setReceiveId(Long receiveId) { this.receiveId = receiveId; } + + public String getCouponName() { + return couponName; + } + + public void setCouponName(String couponName) { + this.couponName = couponName; + } + + public String getGiveName() { + return giveName; + } + + public void setGiveName(String giveName) { + this.giveName = giveName; + } + + public String getReceiveName() { + return receiveName; + } + + public void setReceiveName(String receiveName) { + this.receiveName = receiveName; + } } -- Gitblit v1.8.0