From e540cd75cc2eb5f9391cbdc6ad75e003305a1ed9 Mon Sep 17 00:00:00 2001
From: zhuoda <zhuoluodada@qq.com>
Date: Wed, 8 Apr 2020 20:30:05 +0800
Subject: [PATCH] v1.1.0

---
 smart-admin-service/smart-admin-api/doc/readme.txt            | 3 ---
 .../smartadmin/module/system/employee/EmployeeController.java | 4 ++--
 .../smartadmin/module/system/role/basic/RoleController.java   | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/doc/readme.txt b/smart-admin-service/smart-admin-api/doc/readme.txt
index b74d5989..952f684b 100644
--- a/smart-admin-service/smart-admin-api/doc/readme.txt
+++ b/smart-admin-service/smart-admin-api/doc/readme.txt
@@ -17,6 +17,3 @@ sa/123456
 LoginService.getSession
 
 7 test类中去掉代码生成run
-
-8 RoleController 更新角色
-  updateRole
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java
index 9b4273a4..eb7befe0 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java
@@ -85,8 +85,8 @@ public class EmployeeController {
     @PostMapping("/employee/updatePwd")
     public ResponseDTO<String> updatePwd(@Valid @RequestBody EmployeeUpdatePwdDTO updatePwdDTO) {
         RequestTokenBO requestToken = SmartRequestTokenUtil.getRequestUser();
-//        return employeeService.updatePwd(updatePwdDTO, requestToken);
-        return ResponseDTO.succ();
+        return employeeService.updatePwd(updatePwdDTO, requestToken);
+//        return ResponseDTO.succ();
     }
 
     @ApiOperation(value = "通过部门id获取当前部门的人员&没有部门的人", notes = "@author yandanyang")
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java
index 9974a75c..c95afff7 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/role/basic/RoleController.java
@@ -42,8 +42,7 @@ public class RoleController {
     @ApiOperation(value = "更新角色", notes = "更新角色")
     @PostMapping("/role/update")
     public ResponseDTO<String> updateRole(@Valid @RequestBody RoleUpdateDTO roleUpdateDTO) {
-//        return roleService.updateRole(roleUpdateDTO);
-          return ResponseDTO.succ();
+        return roleService.updateRole(roleUpdateDTO);
     }
 
     @ApiOperation(value = "获取角色数据", notes = "根据id获取角色数据")