Merge branch 'master' into div

yujian

2019-07-11 1510301f5673631ad24fb5634bff5d504eda5ccd

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

@@ -599,7 +599,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;

               }