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/PushGoodsRecordMapper.java

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

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.push.PushGoodsRecord;

public interface PushGoodsRecordMapper {

   int deleteByPrimaryKey(Long id);

   int insert(PushGoodsRecord record);

   int insertSelective(PushGoodsRecord record);

   PushGoodsRecord selectByPrimaryKey(Long id);

   int updateByPrimaryKeySelective(PushGoodsRecord record);

   int updateByPrimaryKey(PushGoodsRecord record);
	
   /**
    * 根据推送id 设备id 查询
    * @param pushId
    * @param deviceId
    * @return
    */
   List<PushGoodsRecord> listByPushIdAndDeviceId( @Param("pushId")Long pushId, @Param("deviceId") Long deviceId);
package com.yeshi.fanli.dao.mybatis.push;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.entity.push.PushGoodsRecord;



public interface PushGoodsRecordMapper {



   int deleteByPrimaryKey(Long id);



   int insert(PushGoodsRecord record);



   int insertSelective(PushGoodsRecord record);



   PushGoodsRecord selectByPrimaryKey(Long id);



   int updateByPrimaryKeySelective(PushGoodsRecord record);



   int updateByPrimaryKey(PushGoodsRecord record);

	
   /**

    * 根据推送id 设备id 查询

    * @param pushId

    * @param deviceId

    * @return

    */

   List<PushGoodsRecord> listByPushIdAndDeviceId( @Param("pushId")Long pushId, @Param("deviceId") Long deviceId);

}