From 25e9112ccc690c715d39fd6063c4c094734a5454 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 28 Jul 2021 20:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7minio=E5=88=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC8.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../src/main/java/com/ruoyi/system/api/domain/SysUser.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c759349b..a79884d1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <velocity.version>1.7</velocity.version>
         <fastjson.version>1.2.76</fastjson.version>
-        <minio.version>8.3.0</minio.version>
+        <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
         <common-pool.version>2.6.2</common-pool.version>
         <commons-collections.version>3.2.2</commons-collections.version>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 187cf7527..ed5389237 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -56,7 +56,6 @@ public class SysUser extends BaseEntity
     private String avatar;
 
     /** 密码 */
-    @JsonIgnore
     private String password;
 
     /** 帐号状态（0正常 1停用） */
@@ -199,6 +198,7 @@ public class SysUser extends BaseEntity
         this.avatar = avatar;
     }
 
+    @JsonIgnore
     @JsonProperty
     public String getPassword()
     {