Merge branch 'test' into 'master'

罗元桥

2021-07-15 2b020ad1e07a91524b496069e1a604b92ebbd7a3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -288,4 +288,7 @@
    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "是否查询全部（1.是 2.否）", hidden = false, example = "true")
    private Integer isAll;

}