Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

 fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java

@@ -36,6 +36,7 @@
   private String owner;// g=自营，p=pop

   private JDPingouInfo pinGouInfo;// 拼购信息

   private Long totalCount;// 有效商品总数量

   private String picUrl;



   public JDCategoryInfo getCategoryInfo() {

      return categoryInfo;