From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/catalog/service/catalogService.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 d8f2489..188c422 100644
--- a/src/main/java/org/springblade/modules/catalog/service/catalogService.java
+++ b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
@@ -36,4 +36,7 @@
 	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