From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 33a47fa..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("鎻愮幇"), extractAutoWX("鑷姩鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
-				"鍒嗕韩濂栭噾鎵i櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵i櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈");
+				"鍒嗕韩濂栭噾鎵i櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵i櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈"),fanliElme("杩斿埄鍒拌处");
 		private final String desc;
 
 		private MsgTypeMoneyTypeEnum(String desc) {

--
Gitblit v1.8.0