Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-02 2116b5b5802c0de0f126f85cf2ac56a732639e82

 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;