From 7ab0221edafd81468b37935fd6e8a9f7cebd181f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 15:14:41 +0800
Subject: [PATCH] 销售台账/采购台账，在新增产品数据的时候,增加一个运费单价(非必填),就像那个含税单价一样,当用户填完数量和运费单价之后,可以直接计算出这个产品的总运费
---
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 62d430c..6498ef9 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,8 +1,7 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import lombok.AllArgsConstructor;
@@ -11,35 +10,35 @@
@RestController
@RequestMapping("/staff/holidayApplication")
@AllArgsConstructor
-public class HolidayApplicationController extends BaseController {
+public class HolidayApplicationController {
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.listPage(page, holidayApplication));
+ public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
}
/**
* 鏂板璇峰亣鐢宠
*/
@PostMapping("/add")
- public R<?> add(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.save(holidayApplication));
+ public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.save(holidayApplication));
}
/**
* 淇敼璇峰亣鐢宠
*/
@PostMapping("/update")
- public R<?> update(@RequestBody HolidayApplication holidayApplication){
- return R.ok(holidayApplicationService.updateById(holidayApplication));
+ public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
+ return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
@DeleteMapping("/delete/{id}")
- public R<?> delete(@PathVariable("id") Long id){
- return R.ok(holidayApplicationService.removeById(id));
+ public AjaxResult delete(@PathVariable("id") Long id){
+ return AjaxResult.success(holidayApplicationService.removeById(id));
}
}
--
Gitblit v1.9.3