From 196dec5ffae084f772dffc0fb1fc4441839f7952 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:59:03 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index 4c73238..d8cc6a2 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -1,14 +1,18 @@
package com.ruoyi.technology.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
+import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/technologyRoutingOperation")
@@ -20,23 +24,23 @@
@GetMapping("/page")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
- public R page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+ public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
}
@GetMapping("/list")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒楄〃")
- public R list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+ public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
}
@GetMapping("/{id}")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭璇︽儏")
- public R getInfo(@PathVariable("id") Long id) {
+ public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
}
- @PostMapping
+ @PostMapping("/add")
@ApiOperation("鏂板宸ヨ壓璺嚎宸ュ簭")
public R add(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
return R.ok(technologyRoutingOperationService.saveTechnologyRoutingOperation(technologyRoutingOperation));
--
Gitblit v1.9.3