冲突后的正式环境代码更改

admin

2019-04-12 4fc1db714a767ab3bf2106028cbd59f3580e7180

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