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

xin

2025-06-03 95dc030ad8e77303207a1a42a3afd9a7a6612d75

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

@@ -1,7 +1,7 @@
package com.oying.modules.pc.product.rest;

import com.oying.annotation.Log;
import com.oying.modules.pc.common.core.domain.R;
import com.oying.utils.R;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.service.ProductService;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;