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/dao/mybatis/user/UserRankMapper.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserRankMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserRankMapper.java
index 675fc2f..b2abd08 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserRankMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserRankMapper.java
@@ -9,6 +9,4 @@
public interface UserRankMapper extends BaseMapper<UserRank> {
List<UserRank> getAllRank();
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0