Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

@@ -758,9 +758,8 @@
         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));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态", COLOR_TITLE), contentList));