Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

 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