From 58253d6b1b23a7ee1d95a0abbe6c5ed5d83a0379 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 20:02:52 +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 |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 e750264..437a9f8 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,8 +1,12 @@
 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;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
@@ -17,17 +21,19 @@
     private static final long serialVersionUID = 1L;
 
     @Schema(title = "鐢ㄦ埛ID")
-    private Long userId;
+    private String userId;
 
     @Schema(title = "鐢ㄦ埛濮撳悕")
     private String userName;
 
-    @Schema(title = "瑙掕壊ID")
-    private Long roleId;
+    @Schema(title = "瑙掕壊缂栧彿鍒楄〃")
+    private List<Map<String, Object>> roleIds;
 
-    @Schema(title = "瑙掕壊鍚嶇О")
-    private String roleName;
+    @Schema(title = "瑙掕壊鍚嶇О鍒楄〃")
+    private List<Map<String, Object>> roleNames;
 
-    @Schema(title = "鎺堟潈鍒楄〃")
-    private String permissions;
-}
+    @Schema(title = "鏉冮檺鍒楄〃")
+    //private List<Map<String, Object>> permissions;
+    private JSONArray permissions;
+
+}
\ No newline at end of file

--
Gitblit v1.8.0