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

maven

7 小时以前 63328dd80adc6331db581dda6418308e6fd4da12

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -1,16 +1,13 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.service.IQualityTestStandardService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -53,16 +50,6 @@
    }

    /**
     * 检测标准主表详情
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityTestStandardService.getById(id));
    }

    /**
     * 检测标准主表修改
     * @param qualityTestStandard
     * @return
@@ -85,12 +72,12 @@

    /**
     * 检测标准复制参数
     * @param qualityTestStandardDto
     * @param qualityTestStandard
     * @return
     */
    @PostMapping("/copyParam")
    public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
    public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }

}