From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +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/sales/controller/SalesQuotationController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index f2e7928..a9d8f75 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,24 +1,24 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/sales/quotation")
-public class SalesQuotationController {
- @Autowired
- private SalesQuotationService salesQuotationService;
+@AllArgsConstructor
+public class SalesQuotationController extends BaseController {
+ private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
- public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
+ public R<?> getList(Page page, SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.listPage(page, salesQuotationDto));
}
@@ -33,15 +33,15 @@
@PostMapping("/add")
- public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
+ public R<?> add(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.add(salesQuotationDto));
}
@PostMapping("/update")
- public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
+ public R<?> update(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.edit(salesQuotationDto));
}
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody Long id) {
- return AjaxResult.success(salesQuotationService.delete(id));
+ public R<?> delete(@RequestBody Long id) {
+ return R.ok(salesQuotationService.delete(id));
}
}
--
Gitblit v1.9.3