From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 041d75c..3b20f82 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -7,8 +7,8 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -55,7 +55,7 @@
*/
@GetMapping("/{id}")
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
--
Gitblit v1.9.3