From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AdminUserMapper.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AdminUserMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AdminUserMapper.java
index b0dca16..a67910b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AdminUserMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/AdminUserMapper.java
@@ -1,11 +1,11 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.common.AdminUser;
-
-public interface AdminUserMapper extends BaseMapper<AdminUser>{
-
-	AdminUser getByAccountAndPwd(@Param("account") String account, @Param("pwd") String pwd);
+package com.yeshi.fanli.dao.mybatis;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.common.AdminUser;
+
+public interface AdminUserMapper extends BaseMapper<AdminUser>{
+
+	AdminUser getByAccountAndPwd(@Param("account") String account, @Param("pwd") String pwd);
 }
\ No newline at end of file

--
Gitblit v1.8.0