Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 1b2c5d5c8ba022a68e23f08bab48198529de1fca

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductCategoryDTO.java

@@ -23,4 +23,7 @@

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;

    @ApiModelProperty(value = "商家id", hidden = true)
    private Long merchantId;
}