From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 03 Dec 2024 09:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java
index e9cd31d..c9a93de 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgReportUserDO.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sg.DO;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -38,7 +39,16 @@
*/
private Long userId;
- /**
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+ @TableField(exist = false)
+ private String roleName;
+
+
+ /**
* 审批状态 0未审批 1通过，2驳回
*/
private Integer approvalStatus;
@@ -62,4 +72,10 @@
* 审批顺序
*/
private Integer isHis;
+ @TableField(exist = false)
+ private String userName;
+
+ @TableField(exist = false)
+ private String deptName;
+
}
--
Gitblit v1.9.3