From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码； 2、删除global模块中一些无用的备份； 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false)，防止编译时警告
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 e750264..f2373d2 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,8 +1,12 @@
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;
+
+import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -14,20 +18,36 @@
@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 id;
@Schema(title = "鐢ㄦ埛濮撳悕")
private String userName;
- @Schema(title = "瑙掕壊ID")
- private Long roleId;
+ @Schema(title = "鎵嬫満鍙�")
+ private String phone;
- @Schema(title = "瑙掕壊鍚嶇О")
- private String roleName;
+ @Schema(title = "鐗囧尯ID")
+ private String blockId;
- @Schema(title = "鎺堟潈鍒楄〃")
- private String permissions;
-}
+ @Schema(title = "鐗囧尯鍚嶇О")
+ private String blockName;
+
+ @Schema(title = "鐘舵�佺紪鍙�")
+ private Integer stateId;
+
+ @Schema(title = "鐘舵�佸悕绉�")
+ private String stateName;
+
+ @Schema(title = "瑙掕壊缂栧彿鍒楄〃")
+ private List<Map<String, Object>> roleIds;
+
+ @Schema(title = "瑙掕壊鍚嶇О鍒楄〃")
+ private List<Map<String, Object>> roleNames;
+
+ @Schema(title = "鏉冮檺鍒楄〃")
+ private JSONArray permissions;
+
+}
\ No newline at end of file
--
Gitblit v1.8.0