From ad589793b49fbf37b81a3f46f5c7142ea5346fab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:55:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index ef56345..002d236 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -75,6 +75,16 @@
 	}
 
 	/**
+	 * 自定义查询,不分页
+	 * @param traceability
+	 * @return
+	 */
+	@GetMapping("/getTraceabilityList")
+	public R getTraceabilityList(TraceabilityVO traceability) {
+		return R.data(traceabilityService.getTraceabilityList(traceability));
+	}
+
+	/**
 	 * 新增
 	 */
 	@PostMapping("/save")

--
Gitblit v1.9.3