From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 2151dda..38c673b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -268,9 +268,9 @@
      */
     @PutMapping(value = "/users/password")
     public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
-        if (checkAdmin(sysUser.getId())) {
-            return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
-        }
+//        if (checkAdmin(sysUser.getId())) {
+//            return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
+//        }
         ResultBody resultBody = appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
         return resultBody;
     }

--
Gitblit v1.8.0