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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -17,5 +17,7 @@
    private String lcGridMemberId;
    @ApiModelProperty(value = "市平台网格员名称")
    private String lcGridMemberName;
    @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
    private String lcBindUserId;

}