Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-08 b76616270df39527e9e149637cde297ef657e7fd

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java

@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.grid;

import java.util.List;

import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("管理后台-网格员返回参数")