Merge branch 'master' into xin

xin

2025-08-29 728466c4924c04dc162811f34086855c51ec0878

 oying-system/src/main/java/com/oying/modules/pc/store/service/StoreAuditService.java

@@ -8,6 +8,7 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.pc.store.view.StoreAuditView;
import com.oying.utils.PageResult;

/**
@@ -23,14 +24,14 @@
    * @param page 分页参数
    * @return PageResult
    */
    PageResult<StoreAudit> queryAll(StoreAuditQueryCriteria criteria, Page<Object> page);
    PageResult<StoreAuditView> queryAll(StoreAuditQueryCriteria criteria, Page<Object> page);

    /**
    * 查询所有数据不分页
    * @param criteria 条件参数
    * @return List<StoreRevisionDto>
    */
    List<StoreAudit> queryAll(StoreAuditQueryCriteria criteria);
    List<StoreAuditView> queryAll(StoreAuditQueryCriteria criteria);

    /**
     * 店铺ID查询修订数据，