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

admin

2020-04-15 3d92fcd729376c584a07d5f23b8e06f81fbcbcde

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

@@ -56,7 +56,7 @@
         List<ClientTextStyleVO> contentList2 = new ArrayList<>();

         contentList2.add(new ClientTextStyleVO(TimeUtil.formatDateDot(startTime) + "-" + TimeUtil.formatDateDot(endTime) + "-于", ClientTextStyleVO.COLOR_CONTENT));

         contentList2.add(new ClientTextStyleVO(days +"" ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

         contentList2.add(new ClientTextStyleVO("天过期", ClientTextStyleVO.COLOR_CONTENT));

         contentList2.add(new ClientTextStyleVO("天后过期", ClientTextStyleVO.COLOR_CONTENT));

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("有效期", ClientTextStyleVO.COLOR_TITLE),contentList2));

         

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("使用范围", ClientTextStyleVO.COLOR_TITLE),

@@ -116,7 +116,7 @@
         List<ClientTextStyleVO> contentList2 = new ArrayList<>();

         contentList2.add(new ClientTextStyleVO(TimeUtil.formatDateDot(startTime) + "-" + TimeUtil.formatDateDot(endTime) + "-于", ClientTextStyleVO.COLOR_CONTENT));

         contentList2.add(new ClientTextStyleVO(days +"" ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

         contentList2.add(new ClientTextStyleVO("天过期", ClientTextStyleVO.COLOR_CONTENT));

         contentList2.add(new ClientTextStyleVO("天后过期", ClientTextStyleVO.COLOR_CONTENT));

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("有效期", ClientTextStyleVO.COLOR_TITLE),contentList2));

         

         listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("使用范围", ClientTextStyleVO.COLOR_TITLE),