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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 fanli/src/main/java/com/yeshi/fanli/dto/msg/MsgCommonDTO.java

@@ -20,7 +20,16 @@
   private Date endTime;// 结束时间

   private JumpDetailV2 jumpDetail;// 跳转方式

   private String params;// 跳转参数

   private String picture;//大图

   private Date updateTime;

	
   public String getPicture() {

      return picture;

   }



   public void setPicture(String picture) {

      this.picture = picture;

   }



   public String getContentMd5() {

      return contentMd5;