From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 01 八月 2022 14:46:47 +0800 Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.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/ComActDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java index 3271be4..e3549e8 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java @@ -4,6 +4,8 @@ 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; @@ -19,6 +21,7 @@ public class ComActDynVO { @ApiModelProperty("主键") + @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty("标题") @@ -100,6 +103,9 @@ private String areaCode; - @ApiModelProperty("类型(1.社区动态 2.党务公开 3.花城资讯)") + @ApiModelProperty("是否培训公共") + private Integer isOrgHatch; + + @ApiModelProperty("类别(1.社区动态 2.招募公告 3.考察记录 4.评审公示 5.孵化培育 6.出壳成果)") private Integer category; } -- Gitblit v1.7.1