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

admin

2019-11-12 6c930b8374bf5b991bc423f02ed22420e78b85ff

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

@@ -1318,7 +1318,7 @@
         if (dto.getTotal() != null) {

            contentList = new ArrayList<>();

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

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("可则算额", COLOR_TITLE), contentList));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("可折算额", COLOR_TITLE), contentList));

         }



         if (!StringUtil.isNullOrEmpty(dto.getNum())) {