Merge remote-tracking branch 'origin/div' into div

admin

2019-08-22 79f52f6eee352a83876233b0e21194cf9d50e4c1

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -758,8 +758,7 @@
         if (dto == null)

            return null;



         icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";

			
         icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png";



         List<ClientTextStyleVO> contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));