From f77e9a7cfbe775523551df5faab3c70a5a9c190c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:35 +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/VoRole.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
index 966e73e..ea4eb65 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
@@ -1,5 +1,6 @@
 package com.dy.pipIrrGlobal.voBa;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.dy.common.po.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,19 +19,19 @@
 @Data
 @Schema(title = "瑙掕壊淇℃伅瑙嗗浘瀵硅薄")
 public class VoRole implements BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @Schema(title = "ID")
-    private Long id;
+    private static final long serialVersionUID = 202401241704001L;
 
     @Schema(title = "瑙掕壊缂栧彿")
-    private Long roleId;
+    private String roleId;
 
     @Schema(title = "瑙掕壊鍚嶇О")
     private String roleName;
 
+    @Schema(title = "鏉冮檺ID")
+    private Long perId;
+
     @Schema(title = "鏉冮檺鍒楄〃")
-    private String permissions;
+    private JSONArray permissions;
 
     @Schema(title = "鎿嶄綔浜�")
     private String operator;

--
Gitblit v1.8.0