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

admin

2020-06-23 eb58d2d4fcc201dbfb31e96c58e680b7da0a846e

 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/TaoBaoGoodsFactory.java

@@ -58,9 +58,9 @@
      // 店铺

      goods.setShopTitle(hdkGoods.getShopname());

      if ("B".equalsIgnoreCase(hdkGoods.getShoptype()))

         goods.setUserType(0);

         goods.setUserType(1); // 天猫

      else

         goods.setUserType(1);

         goods.setUserType(0); // 淘宝

      

      return goods;

   }