From 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2019 15:13:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 3418d82..f2792c4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -19,7 +19,6 @@
@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
-
share("鍒嗕韩濂栭噾"),
invite("閭�璇峰閲�"),
fanli("杩斿埄鍒拌处"),
@@ -32,7 +31,12 @@
orderReward("杩斿埄濂栧姳"),
systemEqualize("绯荤粺琛ラ綈"),
fanliElme("杩斿埄鍒拌处"),
- subSidy("棰濆琛ヨ创");
+ subSidy("棰濆琛ヨ创"),
+ redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),
+ redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),
+ redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
+ redPackExchangeReject("绾㈠寘鎻愮幇澶辫触");
+
private final String desc;
private MsgTypeMoneyTypeEnum(String desc) {
@@ -77,6 +81,8 @@
private Date updateTime;
@Column(name = "mm_read")
private Boolean read;
+ @Column(name = "mm_content") // 娑堟伅鍐呭
+ private String content;
public Long getId() {
return id;
@@ -213,4 +219,12 @@
public void setDesc(String desc) {
this.desc = desc;
}
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
}
--
Gitblit v1.8.0