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

tangxiaobao

2021-09-06 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActWorkGuideDTO.java

@@ -15,6 +15,9 @@
    @ApiModelProperty("办事指南标题")
    private String title;

    @ApiModelProperty("所属分类")
    private Integer classify;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;