Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -66,10 +66,6 @@
    /** 用户头像 */
    private String avatar;
    /** 密码 */

    private String userType;

    /** 密码 */
    @NotBlank(message = "密码不能为空")
    private String password;