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

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -604,7 +604,7 @@
            // 判断收藏

            if (!StringUtil.isNullOrEmpty(uid)) {

               CollectionGoodsV2 collectionGoods = collectionGoodsV2Service

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId(),Constant.SOURCE_TYPE_TAOBAO);

               if (collectionGoods != null) {

                  collected = 1;

               }