From f90496a3b635226e1be5321402b6afd1fdd2fa84 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 17:15:03 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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..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,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;
@@ -20,7 +21,7 @@
private static final long serialVersionUID = 1L;
@Schema(title = "鐢ㄦ埛ID")
- private Long userId;
+ private String userId;
@Schema(title = "鐢ㄦ埛濮撳悕")
private String userName;
@@ -32,6 +33,7 @@
private List<Map<String, Object>> roleNames;
@Schema(title = "鏉冮檺鍒楄〃")
- private List<Map<String, Object>> permissions;
+ //private List<Map<String, Object>> permissions;
+ private JSONArray permissions;
}
\ No newline at end of file
--
Gitblit v1.8.0