Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -33,7 +33,7 @@
      shopInfoVO.setScoreLogistics(shop.getScoreLogistics());

      shopInfoVO.setScoreGoodsD(shop.getScoreGoodsD());

      shopInfoVO.setScoreSellerD(shop.getScoreSellerD());

      shopInfoVO.setScoreLogistics(shop.getScoreLogisticsD());

      shopInfoVO.setScoreLogisticsD(shop.getScoreLogisticsD());

      shopInfoVO.setGoodRatePercentage(shop.getGoodRatePercentage());

      

      Integer shopType = shop.getUserType();