Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-08-19 14:26:34 +08:00

View File

@@ -84,6 +84,7 @@ public class UserController {
vo.setRoles(userInfo.getRoles());
vo.setPermissions(userInfo.getPermissions());
vo.setOrg(userInfo.getOrg());
user.setOrgName(userInfo.getOrg().getName());
return R.ok(vo);
}
@@ -479,7 +480,7 @@ public class UserController {
}
@DeleteMapping("/del/signature/{userId}")
@ApiOperation(value = "删除电子签名",notes = "通过传入用户ID直接删除该用户电子签名数据")
@ApiOperation(value = "删除电子签名", notes = "通过传入用户ID直接删除该用户电子签名数据")
public R deleteSignature(@PathVariable String userId) {
SysUser user = userService.getById(userId);
if (user == null) {