From 50361d9b29962f66b05df0732820840c6531f84f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 14:23:27 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 edd3477..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,12 +19,24 @@
@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
-
- share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractAutoWX("鑷姩鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
- "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈"),fanliElme("杩斿埄鍒拌处"),
- redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),redPackExchangeReject("绾㈠寘鎻愮幇澶辫触");
-
-
+ share("鍒嗕韩濂栭噾"),
+ invite("閭�璇峰閲�"),
+ fanli("杩斿埄鍒拌处"),
+ extract("鎻愮幇"),
+ extractAutoWX("鑷姩鎻愮幇"),
+ extractValid("鎻愮幇璐﹀彿楠岃瘉"),
+ shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎"),
+ inviteWeiQuan("閭�璇峰閲戞墸闄�"),
+ fanliWeiQuan("杩斿埄鎵ｉ櫎"),
+ orderReward("杩斿埄濂栧姳"),
+ systemEqualize("绯荤粺琛ラ綈"),
+ fanliElme("杩斿埄鍒拌处"),
+ subSidy("棰濆琛ヨ创"),
+ redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),
+ redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),
+ redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
+ redPackExchangeReject("绾㈠寘鎻愮幇澶辫触");
+
private final String desc;
private MsgTypeMoneyTypeEnum(String desc) {
@@ -71,8 +83,7 @@
private Boolean read;
@Column(name = "mm_content") // 娑堟伅鍐呭
private String content;
-
-
+
public Long getId() {
return id;
}
--
Gitblit v1.8.0