Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 73f86cb94faa49f1157d6c9f00737a28f63507f4

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

@@ -36,4 +36,7 @@
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageSize;

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