Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New...

liyong

5 天以前 9d66bfbfcda297f628e6a857e343f98422f4534a

 src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java

@@ -1,15 +1,12 @@
package com.ruoyi.warehouse.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.DocumentationFile;
import com.ruoyi.warehouse.service.DocumentationFileService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;

/**
@@ -39,7 +36,7 @@
     * @return
     */
    @DeleteMapping("/del")
    public AjaxResult delDocumentationFile(@RequestBody List<Integer> ids) {
    public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
@@ -48,14 +45,14 @@
    }

    /**
     *分页查询
     * @param page
     *查询
     * @param
     * @param documentationFile
     * @return
     */
    @GetMapping("/listPage")
    public AjaxResult documentationFileListPage(Page page, DocumentationFile documentationFile) {
        return AjaxResult.success(documentationFileService.documentationFileListPage(page, documentationFile));
    public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
        return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
    }