From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
index 29d4e6a..d53e025 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
@@ -14,11 +14,12 @@
* @author Administrator
*
*/
-@Table("yeshi_red_pack_detail")
+@Table("yeshi_ec_red_pack_detail")
public class RedPackDetail {
public enum RedPackDetailTypeEnum {
refund("绾㈠寘閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- violation("绾㈠寘娑夊珜杩濊", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ deduct("绾㈠寘娑夊珜杩濊", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ forbid("娑夊珜鎭舵剰鏈哄埛绾㈠寘", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
newUserReward("鏂颁汉濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
invite("绔嬪緱鐜伴噾", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
increaseReward("閫掑濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
@@ -81,6 +82,8 @@
@Column(name = "rpd_display")
private Boolean display;
+ private BigDecimal balance;
+
public Long getId() {
return id;
}
@@ -160,4 +163,12 @@
public void setDisplay(Boolean display) {
this.display = display;
}
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
}
--
Gitblit v1.8.0