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

admin

2020-03-09 8a1878856e4cdd735d03c1cb7cd1576ed5967d1c

 fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java

@@ -379,10 +379,12 @@
         InputStream ziying = null;
         if (goods.getShopType() == 21) {
            ziying = ImageUtil.class.getClassLoader().getResourceAsStream("image/icon_ziying.png");
            g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
         } else if (goods.isBaoyou()) {
            ziying = ImageUtil.class.getClassLoader().getResourceAsStream("image/icon_baoyou.png");
            g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
         }
         g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
			

         // 销量
         String sale = null;