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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -563,6 +563,9 @@
         goods.setTitle(v2.getDtitle());

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

            goods.setPictUrlWhite(v2.getMainPic());

         // 设置简介



         goods.setDescription(v2.getDesc());

         // 如果没有券信息,则提供券信息

         if (canFilterCouponInfo(goods, v2)) {

            try {