Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

 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);
   
   /**
    * 查询已推送记录