From 2a88e5f26338343f0d1f20e4da80c7da44ed9e3a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 08 八月 2023 16:24:53 +0800
Subject: [PATCH] 增加mybatisplus代码生成工具 修复日志打印缺少操作内容的问题 修复app任务空指针问题 优化海康sdk日志打印
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 1f48457..e12ef24 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
@@ -3,6 +3,8 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -29,6 +31,7 @@
* 鐢ㄦ埛ID
*/
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.STRING, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId
private String userId;
/**
@@ -108,26 +111,31 @@
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
})
+ @TableField(exist = false)
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
+ @TableField(exist = false)
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
+ @TableField(exist = false)
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
+ @TableField(exist = false)
private Long[] postIds;
/**
* 瑙掕壊ID
*/
+ @TableField(exist = false)
private Long roleId;
/**
@@ -145,14 +153,28 @@
*/
private String appUserType;
/**
+ * app鐢ㄦ埛鍦ㄧ嚎鐘舵��
+ * 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String appOnlineState;
+ /**
* 鍏宠仈鎶ヨ绫诲瀷缁�
*/
+ @TableField(exist = false)
private List<String> commands;
public SysUser() {
}
+ public String getAppOnlineState() {
+ return appOnlineState;
+ }
+
+ public void setAppOnlineState(String appOnlineState) {
+ this.appOnlineState = appOnlineState;
+ }
+
public String getAppUserType() {
return appUserType;
}
--
Gitblit v1.9.3