Merge branch 'master' into xin

xin

2025-07-21 548bead175143ab846aaf0816f2ff1129050e94a

 oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
import com.oying.modules.pc.product.domain.enums.ProductStatusEnum;
import com.oying.modules.pc.product.service.ProductImageService;
import com.oying.modules.pc.product.service.ProductLabelService;
import com.oying.modules.pc.product.service.ProductService;
@@ -54,6 +55,7 @@
        criteria.setCategoryId(categoryId);
        criteria.setSecondCategoryId(secondCategoryId);
        criteria.setBlurry(blurry);
        criteria.setShelfStatus(ProductStatusEnum.AVAILABLE.getValue());
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        PageResult<Product> productPageResult = productService.queryAll(criteria, page);