From b6ebb7d8e25fa5505494204abbc54da849ca548e Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 17:14:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

---
 src/main/java/org/springblade/modules/catalog/service/catalogService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/catalog/service/catalogService.java b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
index c4e94de..188c422 100644
--- a/src/main/java/org/springblade/modules/catalog/service/catalogService.java
+++ b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
@@ -33,6 +33,10 @@
  * @since 2020-07-06
  */
 public interface catalogService extends IService<catalog> {
-	List<catalogVO> selectCatalogList();
-
+	List<Map<String, Object>> selectCatalogList();
+	List<Map<String, Object>> selectCatalogEqNUmber(String pid);
+	List<Map<String, Object>> selectCount();
+	List<Map<String, Object>> selectAddvcd();
+	List<Map<String, Object>> selectEq();
+	List<Map<String, Object>> selectWar();
 }

--
Gitblit v1.9.3