Merge remote-tracking branch 'origin/master'

admin

2019-02-27 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3

 fanli/src/main/java/com/yeshi/fanli/vo/msg/UserHomeMsgVO.java

@@ -10,6 +10,7 @@
   public final static String TYPE_GOODS_2 = "goods_2";

   public final static String TYPE_GOODS_3 = "goods_3";



   private String icon;

   private String type;

   private String title;

   private String content;

@@ -55,4 +56,12 @@
   public void setGoodsList(List<TaoBaoGoodsBrief> goodsList) {

      this.goodsList = goodsList;

   }



   public String getIcon() {

      return icon;

   }



   public void setIcon(String icon) {

      this.icon = icon;

   }

}