From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +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 e94af22..1b94de8 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
@@ -92,12 +92,10 @@
 	 * 岗位id
 	 */
 	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