Merge remote-tracking branch 'origin/master'

xuhy

2025-06-17 ead0a2f837503380c26f008338ac9ce026680e47

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -33,7 +33,8 @@
    /** 部门ID */
    //@Excel(name = "部门编号", type = Type.IMPORT)
    @ApiModelProperty(value = "部门id")
    private Long deptId;
    @TableField("deptId")
    private String deptId;

    /** 用户账号 */
    //@Excel(name = "登录名称")
@@ -191,12 +192,12 @@
        return userId != null && 1L == userId;
    }

    public Long getDeptId()
    public String getDeptId()
    {
        return deptId;
    }

    public void setDeptId(Long deptId)
    public void setDeptId(String deptId)
    {
        this.deptId = deptId;
    }