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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -1,22 +1,22 @@
package com.yeshi.fanli.dao.mybatis.push;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.xinge.PushRecord;

public interface PushRecordMapper extends BaseMapper<PushRecord>{
	
   List<PushRecord> listQuery(@Param("start")long start, @Param("count") int count, @Param("key") String key,
         @Param("type") Integer type);

   Long countQuery(@Param("key") String key, @Param("type") Integer type);
	
	
   PushRecord getByAndroidPushId(@Param("pushId") String pushId);
	
	
   PushRecord getByIosPushId(@Param("pushId") String pushId);
package com.yeshi.fanli.dao.mybatis.push;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.entity.xinge.PushRecord;



public interface PushRecordMapper extends BaseMapper<PushRecord>{

	
   List<PushRecord> listQuery(@Param("start")long start, @Param("count") int count, @Param("key") String key,

         @Param("type") Integer type);



   Long countQuery(@Param("key") String key, @Param("type") Integer type);

	
	
   PushRecord getByAndroidPushId(@Param("pushId") String pushId);

	
	
   PushRecord getByIosPushId(@Param("pushId") String pushId);

}