Merge remote-tracking branch 'origin/master'

yujian

2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3

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

@@ -6,11 +6,9 @@


public interface PushRecordService {



   public void save(PushRecord pushRecord);

   public List<PushRecord> getPushRecordList(long page, int pageSize, String title, int type);



   public List<PushRecord> getPushRecordList(String title, int type, int page);



   public int getCount(String title, int type, int page);

   public Long getCount(String title, int type);



   public void increaseByAndroid(String pushId);