From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
index 7a3716f..95c045c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
* ID
*/
@ApiModelProperty(value = "ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -225,13 +228,14 @@
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateAt;
-
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
/**
* 登录用户id
*/
@ApiModelProperty(value = "登录用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("账号")
@@ -241,6 +245,7 @@
private String password;
@ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@ApiModelProperty("状态")
@@ -256,9 +261,10 @@
private String latitude;
@ApiModelProperty("服务类型")
- private Long serviceType;
+ private String serviceType;
@ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long streetId;
@ApiModelProperty("服务类型名称")
@@ -278,4 +284,31 @@
@ApiModelProperty("社区名字")
private String communityName;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("挂靠单位")
+ private Long affiliatedUnit;
+
+ @ApiModelProperty("挂靠单位类型（1.街道 2.社区）")
+ private Integer affiliatedUnitType;
+
+ @ApiModelProperty("挂靠单位名称")
+ private String affiliatedUnitName;
+
+ @ApiModelProperty("承办项目数")
+ private Integer undertakeProjectNum;
+
+ @ApiModelProperty("开展活动数")
+ private Integer startActNum;
+
+ @ApiModelProperty("孵化进度（1.已进驻 2.孵化中 3.通过评估 4.出壳）")
+ private Integer hatchSchedule;
}
--
Gitblit v1.7.1