Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -8,8 +8,10 @@

import javax.validation.constraints.Min;
import javax.validation.constraints.Pattern;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @author zzj
@@ -85,4 +87,11 @@

    @ApiModelProperty("id数组")
    private Integer[] ids;

    @ApiModelProperty("管辖区域")
    private String jurisdictionContent;

    @ApiModelProperty("管辖区域数组")
    private List<String> jurisdictionContentList;

}