From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
index b871ac0..820f05d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
@@ -76,13 +76,13 @@
/**
* 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
*/
- @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export1/{ids}")
- public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ public void export(HttpServletResponse response, @PathVariable Long[] ids) {
List<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "瀹跺涵璁惧鏁版嵁");
}
@@ -116,7 +116,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEquipment zfEquipment)
{
- return zfEquipmentService.addData2(zfEquipment);
+ return zfEquipmentService.addData(zfEquipment);
}
/**
@@ -127,7 +127,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfEquipment zfEquipment)
{
- return toAjax(zfEquipmentService.updateById(zfEquipment));
+ return zfEquipmentService.updateData(zfEquipment);
}
//
/**
@@ -138,7 +138,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfEquipmentService.removeByIds(Arrays.asList(ids)));
+ return zfEquipmentService.deleteData(ids);
}
}
--
Gitblit v1.9.1