Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

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