Merge remote-tracking branch 'origin/pxb'

xin

2025-07-02 bd375f4fe8081c0ca612d72ed06c47ab3f89d68d

 oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductQueryCriteria.java

@@ -25,6 +25,8 @@

    private Long secondCategoryId;

    private Integer active;

    @ApiModelProperty(value = "页码", example = "1")
    private Integer page = 1;