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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

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

@@ -65,4 +65,8 @@
    private Long streetId;
    @ApiModelProperty("分类2")
    private Integer type2;
    @ApiModelProperty("一级分类")
    private Integer columnId;
    @ApiModelProperty("二级分类")
    private Integer secondColumnId;
}