From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 1dd9fa2..511832e 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -11,11 +11,12 @@
import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -26,9 +27,9 @@
@RestController
@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
@RequestMapping("/measuringInstrumentLedgerRecord")
+@AllArgsConstructor
public class MeasuringInstrumentLedgerRecordController extends BaseController {
- @Autowired
private MeasuringInstrumentLedgerRecordService measuringInstrumentLedgerRecordService;
@@ -68,11 +69,6 @@
@PostMapping("/export")
public void export(HttpServletResponse response) {
measuringInstrumentLedgerRecordService.export( response);
- }
-
- @GetMapping("/detail/{id}")
- public AjaxResult getById(@PathVariable("id") Long id) {
- return AjaxResult.success(measuringInstrumentLedgerRecordService.getById(id));
}
}
--
Gitblit v1.9.3