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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/CustomerNameMapper.java

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

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.system.CustomerName;

public interface CustomerNameMapper extends BaseMapper<CustomerName>{
	
   List<CustomerName> listByTypeAndName(@Param("start") long start, @Param("count") int count, 
         @Param("type")Integer type, @Param("key")String key);
package com.yeshi.fanli.dao.mybatis;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.entity.system.CustomerName;



public interface CustomerNameMapper extends BaseMapper<CustomerName>{

	
   List<CustomerName> listByTypeAndName(@Param("start") long start, @Param("count") int count, 
         @Param("type")Integer type, @Param("key")String key);

}