Merge remote-tracking branch 'origin/master'

无关风月

2025-07-02 a8176a321bc00f56524852abea7680948547b1b3

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

@@ -40,8 +40,8 @@
    //@Excel(name = "登录名称")
    @ApiModelProperty(value = "登录名称")
    private String userName;
    @TableField("dept_type")
    @ApiModelProperty(value = "部门类型 1项目部 2部门")
    @TableField("deptType")
    private Integer deptType;
    @TableField("code")
    @ApiModelProperty(value = "编号")