From b082da73a1e0259738ccb33ebf7d80cad3dc3a10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 6e44a3b..7709981 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -92,11 +92,6 @@
 	}
 
 	/**
-	 * 鐩愬姞瀵�
-	 */
-	private String salt;
-
-	/**
 	 * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
 	 */
 	private String status;

--
Gitblit v1.9.3