Commit 9145c76a0b5a2b66d7e2bace0e9e52ae48bea6d4
Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
Showing
2 changed files
with
2 additions
and
2 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
... | ... | @@ -138,7 +138,7 @@ |
138 | 138 | <a-menu-item> |
139 | 139 | <a href="javascript:;" @click="handleDetail(record)">详情</a> |
140 | 140 | </a-menu-item> |
141 | - <a-menu-item> | |
141 | + <a-menu-item v-has="'user:changePassword'"> | |
142 | 142 | <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a> |
143 | 143 | </a-menu-item> |
144 | 144 | |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
... | ... | @@ -350,7 +350,7 @@ public class SysUserController { |
350 | 350 | /** |
351 | 351 | * 修改密码 |
352 | 352 | */ |
353 | - @RequiresRoles({"admin"}) | |
353 | +// @RequiresRoles({"admin"}) | |
354 | 354 | @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) |
355 | 355 | public Result<?> changePassword(@RequestBody SysUser sysUser) { |
356 | 356 | SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername())); |
... | ... |