From c568a328a8c273531773710fe814ac429bafc48f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 29 一月 2024 14:09:12 +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 |   18 ++++++++++++++++--
 1 files changed, 16 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 437a9f8..f79881f 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
@@ -18,13 +18,28 @@
 @Data
 @Schema(title = "鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄")
 public class VoUserInfo implements BaseEntity {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 202401241704002L;
 
     @Schema(title = "鐢ㄦ埛ID")
     private String userId;
 
     @Schema(title = "鐢ㄦ埛濮撳悕")
     private String userName;
+
+    @Schema(title = "鎵嬫満鍙�")
+    private String phone;
+
+    @Schema(title = "鐗囧尯ID")
+    private String blockId;
+
+    @Schema(title = "鐗囧尯鍚嶇О")
+    private String blockName;
+
+    @Schema(title = "鐘舵�佺紪鍙�")
+    private Integer stateId;
+
+    @Schema(title = "鐘舵�佸悕绉�")
+    private String stateName;
 
     @Schema(title = "瑙掕壊缂栧彿鍒楄〃")
     private List<Map<String, Object>> roleIds;
@@ -33,7 +48,6 @@
     private List<Map<String, Object>> roleNames;
 
     @Schema(title = "鏉冮檺鍒楄〃")
-    //private List<Map<String, Object>> permissions;
     private JSONArray permissions;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0