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

yujian

2020-04-15 b907ba5b12a98e31d56c8847769875906a682b98

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