Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java

@@ -49,7 +49,7 @@
    * @return
    */
   List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
       @Param("pushTime") Date pushTime);
       @Param("uid") Long uid, @Param("pushTime") Date pushTime);
   
   /**
    * 统计历史推送商品信息
@@ -58,7 +58,7 @@
    * @param pushTime
    * @return
    */
   long countHistoryByPushTime(@Param("pushTime") Date pushTime);
   long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
   
   /**
    * 查询已推送记录
@@ -68,4 +68,10 @@
   List<PushGoods>  listByPushState(List<Long> list);
   
   
   /**
    * 需要执行推送的任务
    * @return
    */
   List<PushGoods> listTask();
	
}