From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 246a26d..3810712 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
@@ -11,6 +11,7 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.Size;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -33,12 +34,28 @@
/** 部门ID */
//@Excel(name = "部门编号", type = Type.IMPORT)
@ApiModelProperty(value = "部门id")
- private Long deptId;
+ @TableField("deptId")
+ private String deptId;
/** 用户账号 */
//@Excel(name = "登录名称")
@ApiModelProperty(value = "登录名称")
private String userName;
+ @ApiModelProperty(value = "部门类型 1项目部 2部门")
+ @TableField("deptType")
+ private Integer deptType;
+ @TableField("code")
+ @ApiModelProperty(value = "编号")
+ private String code;
+ @TableField("templateId")
+ @ApiModelProperty(value = "所属任务模板id")
+ private String templateId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "合格率")
+ private BigDecimal rate;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "完成率")
+ private BigDecimal finish;
/** 用户昵称 */
//@Excel(name = "用户名称")
@@ -124,6 +141,7 @@
private Integer districtId;
@TableField(exist = false)
+ @ApiModelProperty("角色名称")
private String roleName;
@TableField(exist = false)
private String deptName;
@@ -134,6 +152,11 @@
@ApiModelProperty(value = "营业部id")
@TableField("business_dept_id")
private String businessDeptId;
+ @ApiModelProperty(value = "openId")
+ @TableField("openId")
+ private String openId;
+
+
public String getRoleName() {
return roleName;
@@ -181,12 +204,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;
}
--
Gitblit v1.7.1