From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +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, 2 insertions(+), 1 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 dce83e5..d8f2489 100644
--- a/src/main/java/org/springblade/modules/catalog/service/catalogService.java
+++ b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
@@ -34,5 +34,6 @@
  */
 public interface catalogService extends IService<catalog> {
 	List<Map<String, Object>> selectCatalogList();
-	String selectCatalogEqNUmber(String pid);
+	List<Map<String, Object>> selectCatalogEqNUmber(String pid);
+	List<Map<String, Object>> selectCount();
 }

--
Gitblit v1.9.3