Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 src/main/java/com/ruoyi/warehouse/service/impl/DocumentationFileServiceImpl.java

@@ -10,6 +10,8 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@AllArgsConstructor
@Service
public class DocumentationFileServiceImpl extends ServiceImpl<DocumentationFileMapper, DocumentationFile> implements DocumentationFileService {
@@ -18,7 +20,7 @@


    @Override
    public IPage<DocumentationFile> documentationFileListPage(Page page, DocumentationFile documentationFile) {
        return documentationFileMapper.documentationFileListPage(page,documentationFile);
    public List<DocumentationFile> documentationFileListPage(DocumentationFile documentationFile) {
        return documentationFileMapper.documentationFileListPage(documentationFile);
    }
}