Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

@@ -1,5 +1,7 @@
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;
@@ -22,6 +24,7 @@
    private Integer serviceTime;

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

    @ApiModelProperty("报道社区id")