Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 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;