From f91feae7adadd6c92dbd49ffcd2358a6b8abfaf4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 15:21:08 +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/pojoBa/BaRolePermissions.java |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
index 3bff3ae..966aec1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
@@ -7,16 +7,18 @@
  * @Description
  */
 
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.dy.common.po.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Positive;
-import jakarta.validation.constraints.Size;
 import lombok.*;
 
 /**
@@ -31,7 +33,7 @@
 @AllArgsConstructor
 @Schema(name = "瑙掕壊鏉冮檺瀹炰綋")
 public class BaRolePermissions implements BaseEntity {
-    public static final long serialVersionUID = 1L;
+    public static final long serialVersionUID = 202401151612001L;
 
     /**
     * 涓婚敭
@@ -49,16 +51,10 @@
     private Long roleid;
 
     /**
-     * 瑙掕壊鍚嶇О
-     */
-    @Schema(description = "瑙掕壊鍚嶇О", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @Size(max = 20)
-    private String roleName;
-
-    /**
     * 鏉冮檺鍒楄〃
     */
     @Schema(description = "鏉冮檺鍒楄〃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @NotBlank(message = "鏉冮檺鍒楄〃涓嶈兘涓虹┖")
-    private String permissions;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray permissions;
 }
\ No newline at end of file

--
Gitblit v1.8.0