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

huanghongfa

2021-09-24 7a282d69e08d875a016975ea4b980bec98a9bab8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -51,4 +51,8 @@
    private String serialNo;
    @ApiModelProperty("小区id")
    private Long areaId;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("职务")
    private String position;
}