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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

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

@@ -20,7 +20,7 @@
   /**

    * 

    */

   private static final long serialVersionUID = 1L;

   private static final long serialVersionUID = 1L;
   private JDCategoryInfo categoryInfo;// 类目信息

   private Long comments;// 评论数

   private JDCommissionInfo commissionInfo;// 佣金信息