Merge remote-tracking branch 'origin/div' into div

yujian

2020-03-17 2242a113524da059a402af214aec30126789ce1e

 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);