From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
index ae1963e..6c7de97 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
@@ -32,14 +32,21 @@
@ApiOperation(value = "鏍囧噯鏍戜笅淇敼璁板綍鍒嗛〉鏌ヨ")
@GetMapping("/standardProductListRecordPage")
- public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
- return Result.success(standardProductListUpdateRecordService.standardProductListRecordPage(page,standardProductListUpdateRecord));
+ public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecordDto standardProductListUpdateRecordDto) {
+ return Result.success(standardProductListUpdateRecordService.standardProductListRecordPage(page,standardProductListUpdateRecordDto));
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ")
@GetMapping("/standardProductListRecordRelPage")
- public Result standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
- return Result.success(standardProductListUpdateRecordService.standardProductListRecordRelPage(page,standardProductListUpdateRecordRel));
+ public Result standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ return Result.success(standardProductListUpdateRecordService.standardProductListRecordRelPage(standardProductListUpdateRecordRel));
+ }
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶")
+ @PostMapping("/uploadRecordFile")
+ public Result uploadRecordFile(@RequestParam("file") MultipartFile file,Long id) {
+ standardProductListUpdateRecordService.uploadRecordFile(file,id);
+ return Result.success();
}
}
--
Gitblit v1.9.3