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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -411,7 +411,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("返利订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("订单维权", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("订单售后", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -440,7 +440,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("订单维权", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("订单售后", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -470,7 +470,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请订单", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("订单维权", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("订单售后", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

@@ -1093,7 +1093,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("被邀请人", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("邀请队员成功", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("邀请粉丝成功", COLOR_CONTENT));

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



         contentList = new ArrayList<>();