Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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