From 0fc9760cf60f30e070c9e1ddb39dff0fe0fb5f91 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 22:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java
index 98dcd1b..61173d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Map;
@Data
@ApiModel("身份信息对象")
@@ -20,6 +21,12 @@
*/
@ApiModelProperty(value = "是否冻结")
private Boolean isFrozen;
+
+ /**
+ * 是否确认提示内容
+ */
+ @ApiModelProperty(value = "是否确认提示内容")
+ private Boolean isConfirmContent;
/**
* 是否确认党员信息
@@ -43,5 +50,5 @@
* 权限列表
*/
@ApiModelProperty(value = "权限列表:1-党员 2-管理员")
- private List<Integer> permissions;
+ private List<PermissionsVO> permissions;
}
--
Gitblit v1.7.1