Merge branch 'xin' into pxb

彭雪彬

2025-09-04 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9

 oying-system/src/main/java/com/oying/modules/pc/product/mapper/ProductAuditMapper.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.pc.product.domain.ProductAudit;
import com.oying.modules.pc.product.domain.dto.ProductAuditQueryCriteria;
import com.oying.modules.pc.product.view.ProductAuditView;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -17,7 +18,7 @@
@Mapper
public interface ProductAuditMapper extends BaseMapper<ProductAudit> {

    IPage<ProductAudit> findAll(@Param("criteria") ProductAuditQueryCriteria criteria, Page<Object> page);
    IPage<ProductAuditView> findAll(@Param("criteria") ProductAuditQueryCriteria criteria, Page<Object> page);

    List<ProductAudit> findAll(@Param("criteria") ProductAuditQueryCriteria criteria);
    List<ProductAuditView> findAll(@Param("criteria") ProductAuditQueryCriteria criteria);
}