Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java

@@ -2,7 +2,7 @@

import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyOperationParamDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationParamVo;
@@ -19,7 +19,7 @@
@RequestMapping("/technologyOperationParam")
@Tag(name = "工序参数")
@RequiredArgsConstructor
public class TechnologyOperationParamController {
public class TechnologyOperationParamController extends BaseController {

    private final TechnologyOperationParamService technologyOperationParamService;

@@ -38,7 +38,7 @@
    @DeleteMapping("/batchDelete/{id}")
    @Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
    @Operation(summary = "删除工序参数")
    public AjaxResult batchDelete(@PathVariable("id") Long id) {
        return AjaxResult.success(technologyOperationParamService.batchDelete(id));
    public R<?> batchDelete(@PathVariable("id") Long id) {
        return R.ok(technologyOperationParamService.batchDelete(id));
    }
}