From 749ad6fe2e845433622992aa0aacd8b0d7714ccc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 00:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java
index 0b62eed..e3fce9c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.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;
@@ -47,7 +49,7 @@
     /**
      * id
      */
-    @TableField("filesId")
+    @TableId("filesId")
     private Long filesid;
 
     /**

--
Gitblit v1.8.0