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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsUpdateServiceImpl.java

@@ -39,7 +39,6 @@


      if (list != null)

         for (TLJBuyGoods TLJBuyGoods : list) {



            if (goods.getCouponInfo() == null)

               goods.setCouponInfo("");

            if (goods.getCouponAmount() == null)