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

luoyuanqiao

2022-03-01 d76c9f4e730422cbe43496adfc57a6e3d36577ab

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

@@ -51,4 +51,14 @@
    private String serialNo;
    @ApiModelProperty("小区id")
    private Long areaId;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("职务")
    private String position;
    @ApiModelProperty("参数id2")
    private Integer paramId2;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("商家id")
    private Long merchantId;
}