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

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CollectionGoodsV2Mapper.java

@@ -57,6 +57,17 @@
    * @param goodsId
    * @return
    */
   CollectionGoodsV2 selectByUidAndGoodsId(@Param("uid") Long uid, @Param("goodsId") Long goodsId);
	
	
   /**
    * 根据用户ID,商品ID，商品类型查询商品
    * 
    * @param id
    * @param goodsType
    * @param goodsId
    * @return
    */
   CollectionGoodsV2 selectByUidAndGoodsType(@Param("uid") Long uid, @Param("goodsId") Long goodsId,
         @Param("goodsType") Integer goodsType);