diff --git a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
index 5e038a4..d4ad651 100644
--- a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
+++ b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
@@ -25,16 +25,16 @@ public class LoginService {
     public AjaxResult login(String name, String pass) {
         try {
             String salt = mapper.login_findSalt(name);
-            SysUser userID = mapper.login_getUser(name, getMD5Str(name + pass + salt));
-            if (userID != null) {
+            SysUser user = mapper.login_getUser(name, getMD5Str(name + pass + salt));
+            if (user != null) {
                 // List<String> menuNameList=name.equals("admin")?
                 //         mapper.selectMenuName():
-                //         mapper.selectMenuNameByUserID(userID);
+                //         mapper.selectMenuNameByUserID(user);
                 // if (menuNameList==null||menuNameList.isEmpty()){
                 //     return "isEmpty";
                 // }
                 // return JSONObject.toJSONString(menuNameList);
-                return AjaxResult.success(userID);
+                return AjaxResult.success(user);
             } else {
                 return AjaxResult.error();
             }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5fc2e2a..48edbbf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-	<resultMap type="SysUser" id="SysUserResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
 		<id     property="userId"        column="user_id"         />
 		<result property="deptId"        column="dept_id"         />
 		<result property="loginName"     column="login_name"      />