Quellcode durchsuchen

新增投票记录

tjf vor 7 Monaten
Ursprung
Commit
fb15d72be8

+ 9 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserVo.java

@@ -1,9 +1,6 @@
 package com.ruoyi.common.core.domain.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * @Author: tjf
@@ -32,6 +29,15 @@ public class SysUserVo{
      * 头像
      */
     private String avatar;
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
     public String getAvatar() {
         return avatar;

+ 2 - 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="nickName"     column="nick_name"    />
 		<result property="avatar"     column="avatar"    />
 		<result property="phonenumber"  column="phonenumber"  />
+		<result property="password"  column="password"  />
 	</resultMap>
 	
 	<sql id="selectUserVo">
@@ -150,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
     <select id="getUserInfoList" parameterType="Long" resultMap="SysUserVoResult">
-		select user_id, user_name,nick_name,phonenumber,avatar from sys_user where user_id in
+		select user_id, user_name,nick_name,phonenumber,avatar,password from sys_user where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
 		</foreach>