From a8176a321bc00f56524852abea7680948547b1b3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 02 七月 2025 10:36:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index c79ac48..449b5a2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/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 = "编号") -- Gitblit v1.7.1