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

admin

2020-04-28 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164

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

@@ -79,6 +79,11 @@
         userMsgVO.setTitle(msg.getType().getDesc());

         userMsgVO.setTime(msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime());

         userMsgVO.setContentItems(items);

			
         userMsgVO.setJumpDetail(jumpDetail);

         if (params != null)

            userMsgVO.setParams(params.toString());

			
         return userMsgVO;

      }