From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
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