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

yujian

2020-01-03 0a63d22e38a644bc83b393ed85618b04d3be858b

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java

@@ -211,6 +211,8 @@


   @Override

   public List<DaTaoKeDetailV2> getGoodsNotInList(Long cid, List<Long> listId, int count) {

      if (cid != null && cid == 0L)

         cid = null;

      return daTaoKeGoodsDetailV2Dao.getGoodsNotInList(cid, listId, count);

   }