From 3499fb29ae47b5db34d998002b0486facdb0f97c Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期五, 19 一月 2024 17:27:42 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java index b73434c..0dd1eb3 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java @@ -1,5 +1,6 @@ package com.dy.pipIrrGlobal.voBa; +import com.alibaba.fastjson2.JSONArray; import com.dy.common.po.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -25,6 +26,21 @@ @Schema(title = "鐢ㄦ埛濮撳悕") private String userName; + @Schema(title = "鎵嬫満鍙�") + private String phone; + + @Schema(title = "鐗囧尯ID") + private Long blockId; + + @Schema(title = "鐗囧尯鍚嶇О") + private String blockName; + + @Schema(title = "鐘舵�佺紪鍙�") + private Integer stateId; + + @Schema(title = "鐘舵�佸悕绉�") + private String stateName; + @Schema(title = "瑙掕壊缂栧彿鍒楄〃") private List<Map<String, Object>> roleIds; @@ -32,6 +48,6 @@ private List<Map<String, Object>> roleNames; @Schema(title = "鏉冮檺鍒楄〃") - private List<Map<String, Object>> permissions; + private JSONArray permissions; } \ No newline at end of file -- Gitblit v1.8.0