Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -61,4 +61,8 @@
    private Long communityId;
    @ApiModelProperty("商家id")
    private Long merchantId;
    @ApiModelProperty("街道id")
    private Long streetId;
    @ApiModelProperty("分类2")
    private Integer type2;
}