Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java

@@ -521,6 +521,8 @@
      if (detail != null && goods != null) {

         // 重新设置标题与券价格

         goods.setTitle(detail.getdTitle());

         if (!StringUtil.isNullOrEmpty(detail.getPic()))

            goods.setPictUrlWhite(detail.getPic());

      }

      return goods;

   }

@@ -529,6 +531,8 @@
      if (detail != null && goods != null) {

         // 重新设置标题与券价格

         goods.setTitle(detail.getDtitle());

         if (!StringUtil.isNullOrEmpty(detail.getMainPic()))

            goods.setPictUrlWhite(detail.getMainPic());

      }

      return goods;

   }