冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java

@@ -18,9 +18,6 @@
   public List<ShamUser> getAll();





   public void delete(long id);





   public List<ShamUser> findShamUserList(int sum);

   

   

@@ -61,4 +58,11 @@
   public int insertBatch(List<ShamUser> list);



   public int updateBatchSelective(List<ShamUser> list);



   /**

    * 随机一定的用户

    * @param count

    * @return

    */

   public List<ShamUser> listRandUser(int count);

}