From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java
index 6389cf0..2c0f18a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java
+++ b/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);
 	
 	

--
Gitblit v1.8.0