Merge branch 'dev' into huacheng

101captain

2022-04-11 ca4c51d239a28f6a89ec73fd3e5441446740daec

 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;
}