Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-07 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec

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

@@ -66,6 +66,12 @@
    /** 用户头像 */
    private String avatar;
    /** 密码 */
    @TableField("user_type")
    private String userType;

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