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

admin

2020-07-01 65844c288f03ddd14892b5aea5e9ef862f3afb01

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