Merge remote-tracking branch 'origin/master'

admin

2018-12-05 ee26d58531067afff8e036efa93cb0d57a773250

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/ShamUserMapper.java

@@ -20,6 +20,24 @@

   int updateByPrimaryKey(ShamUser record);
   
	
	
   /**
    * 批量插入
    * @param list
    * @return
    */
   int insertBatch(List<ShamUser> list);
	
	
   /**
    * 批量选择更新
    * @param list
    * @return
    */
   int updateBatchSelective(List<ShamUser> list);
	
	
   /**
    * 根据条件查询标签
    * @return