From 05d218bdda3f09aa5d057fda916f5f0b668fb720 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 17:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/entity/User.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index bce47f7..94138e8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -157,7 +157,7 @@
 
 
 	private String hold;
-
+	private Integer status;
 	/**
 	 * 行政区域id
 	 */

--
Gitblit v1.9.3