Merge branch 'dev_2'

yujian

2019-05-14 1823108940bb5fda2d26787236dc5df3004bc0ec

 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);