From df2ff592a5b9037a747032f3351836e0c61fb4f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 08:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 15 ---------------
1 files changed, 0 insertions(+), 15 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..09237a5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -8,7 +8,6 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
-import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.List;
/**
* @author :yys
@@ -52,14 +50,6 @@
return AjaxResult.error();
}
- @DeleteMapping("/delete")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
- @Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
- return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
- }
-
/**
* 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
*/
@@ -68,11 +58,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