From 477be92633089830178b9b98af7a1ffd20e2f8f2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 17:54:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index 6635c05..a1dd7c3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -48,8 +48,8 @@
 	}
 	
 	@PostMapping(value = "/unit/delete")
-	public R<TCompany> delete(@RequestParam("id") Integer id) {
-		return R.ok(companyService.getById(id));
+	public R delete(@RequestParam("id") Integer id) {
+		return R.ok(companyService.removeById(id));
 	}
 }
 

--
Gitblit v1.7.1