Merge remote-tracking branch 'origin/test' into test

CeDo

2021-06-04 c7c38dfd96047930999bcd7cf62d18d6d8651108

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

@@ -6,6 +6,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Data
@ApiModel("管理后台-网格返回参数")
@@ -16,7 +17,7 @@
    @ApiModelProperty(value = "网格名称")
    private String gridName;
    @ApiModelProperty(value = "网格员")
    private String gridMemberName;
    private List<GridMemberAdminVO> gridMembers;
    @ApiModelProperty(value = "网格描述")
    private String remarks;
    @ApiModelProperty(value = "网格面积")