Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/TaoBaoGoodsBriefService.java

@@ -90,5 +90,12 @@
    * @param id

    */

   public void deleteByPrimaryKey(Long id);

	
	
   /**

    * 过滤掉下架商品

    * @param goodsList

    */

   public List<TaoBaoGoodsBrief>  filterOffLineGoods(List<TaoBaoGoodsBrief> goodsList);



}