From 0b7918b0a8fd7cbaf0e33f0021fd7f001a0daaf6 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 23 二月 2021 17:17:13 +0800
Subject: [PATCH] 新增员工基本信息,图片上传

---
 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 6c8b402..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
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.common.core.entity.system;
 
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
 import cc.mrbird.febs.common.core.converter.TimeConverter;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -24,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")
@@ -46,6 +47,26 @@
     @ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
     private Date modifyTime;
 
+    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除,默认0")
+    @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