From a381a654833decf21cad316ffbda8b3e9c834118 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index 4969151..8663f4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -112,6 +112,7 @@
 	final static String MSG_TYPE_MONEY = "money";
 	final static String MSG_TYPE_ACCOUNT = "account";
 	final static String MSG_TYPE_INVITE = "invite";
+	final static String MSG_TYPE_OTHER = "other";
 
 	/**
 	 * 鑾峰彇璁㈠崟娑堟伅鍒楄〃

--
Gitblit v1.8.0