Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java

@@ -1,12 +1,16 @@
package com.panzhihua.common.model.vos.neighbor;

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;

import java.io.Serializable;

@Data
@ApiModel
public class UnitActivityAnalysisVO {
public class UnitActivityAnalysisVO implements Serializable {
    @ApiModelProperty("单位名称")
    private String unitName;

@@ -20,6 +24,7 @@
    private Integer serviceTime;

    @ApiModelProperty("单位id'")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long unitId;

    @ApiModelProperty("报道社区id")