Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsPicture.java

@@ -18,9 +18,9 @@
   // 商品信息

   @Expose

   private TaoBaoGoodsBriefExtra goods;

   // 商品信息

   @Expose

   private GoodsDetailVO goodsVO;

	
   // 跳转类型

   @Expose

   private JumpDetailV2 jumpDetail;