Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 d4c19062530c46203b0950b20e66afdeefcdf3a6

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java

@@ -49,9 +49,9 @@
    * @param pushTime

    * @return

    */

   public List<PushGoods> listHistoryByPushTime(long start, int count, Date pushTime);

   public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime);



   public long countHistoryByPushTime(Date pushTime);

   public long countHistoryByPushTime(Long uid, Date pushTime);



   

   /**