From 64b60d9106a289abd63463c38f08e2cb7c39a7f6 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 27 五月 2024 16:35:02 +0800
Subject: [PATCH] 田间灌溉项目管理 灌溉制度模块  修改查询流浪灌溉单元和已绑定灌溉单元接口返回id类型

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 b73434c..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
@@ -1,5 +1,6 @@
 package com.dy.pipIrrGlobal.voBa;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.dy.common.po.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -17,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 Long userId;
+    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;
@@ -32,6 +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