冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/ShareHotGoodsService.java

@@ -21,6 +21,9 @@
    * @return

    */

   public List<ShareHotGoods> listByDay(String day);

	
	
   public List<ShareHotGoods> listByDay(String day,int count);



   /**

    * 根据主键删除

@@ -36,4 +39,19 @@
    */

   public List<TaoBaoGoodsBrief> listPreGoods();



   /**

    * 根据商品id删除

    * 
    * @param goodsId

    */

   public void deleteByGoodsId(Long goodsId);



   /**

    * 验证是否可以创建淘礼金

    * 
    * @param auctionId

    * @return

    */

   public boolean verifyCanCreateTLJ(Long auctionId);



}