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

maven

昨天 55c4143362c7df1ece4523597e26947d35e21bda

 src/main/java/com/ruoyi/warehouse/mapper/DocumentationFileMapper.java

@@ -8,8 +8,10 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface DocumentationFileMapper extends BaseMapper<DocumentationFile> {

    IPage<DocumentationFile> documentationFileListPage(Page page, @Param("documentationFile") DocumentationFile documentationFile);
    List<DocumentationFile> documentationFileListPage(@Param("documentationFile") DocumentationFile documentationFile);
}