From 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
index 3b16661..baf1e2b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
@@ -1,15 +1,14 @@
package cc.mrbird.febs.server.hr.entity;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
* 文件夹 Entity
@@ -46,7 +45,7 @@
/**
* id
*/
- @TableId("parentId")
+ @TableField("parentId")
private Long parentId;
/**
* 文件夹名称
--
Gitblit v1.8.0