From 2b71869efe32d2b8f0bc9351bec4d0b0ed8efcf0 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 07:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
index dea2a32..bfcc26e 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
@@ -25,7 +25,7 @@
public static final Long TOP_DEPT_ID = 0L;
private static final long serialVersionUID = -7790334862410409053L;
- @TableId(value = "DEPT_ID", type = IdType.AUTO)
+ @TableId(value = "DEPT_ID")
private Long deptId;
@TableField(value = "PARENT_ID")
@@ -51,6 +51,22 @@
@TableField("delFlag")
private Integer delFlag = 0;
+ @FieldInfo(name = "deptType", type = "varchar", explain = "部门类型")
+ @TableField("deptType")
+ private String deptType = "部门类型";
+
+ @FieldInfo(name = "deptTypeName", type = "varchar", explain = "部门类型")
+ @TableField(exist = false)
+ private String deptTypeName;
+
+ @FieldInfo(name = "deptFunction", type = "varchar", explain = "部门职能")
+ @TableField("deptFunction")
+ private String deptFunction = "04";
+
+ @FieldInfo(name = "deptFunctionName", type = "varchar", explain = "部门职能")
+ @TableField(exist = false)
+ private String deptFunctionName;
+
private transient String createTimeFrom;
private transient String createTimeTo;
--
Gitblit v1.8.0