From 1daff9a8151820980da082ece4c923f946ff8028 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:00:23 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 9ec4222..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("状态")
@@ -259,6 +264,7 @@
private String serviceType;
@ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long streetId;
@ApiModelProperty("服务类型名称")
--
Gitblit v1.7.1