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/pojoBa/BaUser.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index 7f54c34..98733f8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -81,7 +81,7 @@
* 瀵嗙爜锛屽瘑鐮佺殑MD5鍔犲瘑
*/
@Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
- @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
+ @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 5, max = 20)
public String password;
/**
@@ -127,6 +127,15 @@
public List<?> roleList ;
/**
+ * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
+ */
+ @Schema(hidden = true)
+ @TableField(exist = false)
+ @JSONField(serialize = false)
+ public List<Integer> privileges;
+
+
+ /**
* 鎵�灞炵墖鍖哄悕绉�
*/
@Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
--
Gitblit v1.8.0