Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.cluster.admin;

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;
@@ -13,6 +15,7 @@
public class PageClusterMemberAdminVo {

    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("群团组织成员名称")
@@ -34,6 +37,7 @@
    private String idCard;

    @ApiModelProperty("所属群团组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long clusterId;

    @ApiModelProperty("所属群团组织名称")