From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 14 ++++++++++++--
1 files changed, 12 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 5ca72ab..fca8135 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,8 +19,9 @@
@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
- share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
- "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈"),fanliElme("杩斿埄鍒拌处");
+
+ share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractAutoWX("鑷姩鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
+ "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈"),fanliElme("杩斿埄鍒拌处");
private final String desc;
private MsgTypeMoneyTypeEnum(String desc) {
@@ -55,6 +56,8 @@
private BigDecimal balance;// 璐︽埛浣欓
@Column(name = "mm_state_desc")
private String stateDesc;// 鐘舵�佽鏄�
+ @Column(name = "mm_desc")
+ private String desc;// 璇存槑
@Column(name = "mm_beizhu")
private String beiZhu;// 澶囨敞
@Column(name = "mm_create_time")
@@ -192,4 +195,11 @@
this.orderType = orderType;
}
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
}
--
Gitblit v1.8.0