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 |    1 +
 1 files changed, 1 insertions(+), 0 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 1b94de8..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

--
Gitblit v1.9.3