Merge branch 'yuyue_dev' into 'test'

罗元桥

2021-08-30 74803a8987f942f94f703fbbf57a4e7d8d7ea44a

 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("管理后台-网格员返回参数")