From 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 15:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
index 3f8dfd2..36807ac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
@@ -9,6 +9,7 @@
 	public static String TYPE_GUANXUAN = "guanxuan";
 	public static String TYPE_ZHUSHOU = "zhushou";
 	public static String TYPE_RECOMMEND = "recommend";
+	public static String TYPE_SYSTEM = "system";//绯荤粺娑堟伅
 
 	private String icon;
 	private String title;

--
Gitblit v1.8.0