Merge branch 'master' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IUserinfoServiceImpl.java

ruoyi-system/src/main/java/com/ruoyi/system/domain/OpenAccount.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Sensitive;
@@ -8,12 +11,12 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.enums.SensitiveStrategy;
-import com.ruoyi.common.xss.Xss;
 import com.ruoyi.system.domain.vo.OpenAccountVO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 
@@ -36,7 +39,7 @@ public class OpenAccount {
     /**
      * 用户Id
      */
-    @TableId(value = "user_id",type = IdType.ASSIGN_ID)
+    @TableId(value = "user_id", type = IdType.ASSIGN_ID)
     private Long userId;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OpenAccountVO.java

@@ -59,7 +59,6 @@ public class OpenAccountVO implements Serializable {
     /**
      * 密码
      */
-    @NotBlank(message = "密码不能为空")
     private String password;
     /**
      * 角色列表

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
+        <result property="uId" column="u_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="userType" column="user_type"/>