From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
index ee306c3..8ffc3a8 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
@@ -87,6 +87,7 @@
/**
* 部门id
*/
+ @TableField("dept_id")
private String deptId;
/**
* 岗位id
@@ -94,11 +95,8 @@
private String postId;
private String online_status;
- @TableField("work_status")
private String work_status;
- @TableField("online_status")
- private String online_status;
}
--
Gitblit v1.9.3