From 767f47d580e180e2574d9fc4d5379813fd80e5ba Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:15:40 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 bcdd50e..8bee454 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,6 +1,8 @@
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.TableName;
@@ -39,7 +41,7 @@
/**
* id
*/
- @TableField("folderId")
+ @TableId("folderId")
private Long folderid;
/**
@@ -71,6 +73,6 @@
*/
@TableField("sort")
@NotNull(message = "{required}")
- @Range(message = "排序范围为 {min} 到 {max} 之间", min = 0, max = 100)
+ @Range(message = "{range}", min = 0, max = 100)
private Integer sort=0;
}
--
Gitblit v1.8.0