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

xin

2025-06-24 9a66c01477b81f8d429a45b0a2922ab75e2e9c64

 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;