Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 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;