冲突文件

yujian

2019-06-24 bd331a582851cffcce54316e677e23760de4f384

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