Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

puhanshu

2022-07-25 976b78af390878551095f77ce9a7a054b595999d

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java

@@ -5,6 +5,8 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;

import io.swagger.annotations.ApiModel;
@@ -22,6 +24,7 @@
public class ComActVO {

    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty("社区名字")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java

@@ -34,5 +34,6 @@
    private String image;

    @ApiModelProperty(value = "物业公司关联id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long refId;
}