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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 5cedf8a..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,12 +40,12 @@
//@Excel(name = "登录名称")
@ApiModelProperty(value = "登录名称")
private String userName;
- @TableField("dept_type")
@ApiModelProperty(value = "部门类型 1项目部 2部门")
+ @TableField("deptType")
private Integer deptType;
@TableField("code")
@ApiModelProperty(value = "编号")
- private Integer code;
+ private String code;
@TableField("templateId")
@ApiModelProperty(value = "所属任务模板id")
private String templateId;
--
Gitblit v1.7.1