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/impl/CatalogServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
index 6b5190f..43fd1a3 100644
--- a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
+++ b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
@@ -47,7 +47,12 @@
 	}
 
 	@Override
-	public String selectCatalogEqNUmber(String pid) {
+	public List selectCatalogEqNUmber(String pid) {
 		return baseMapper.selectCatalogEqNUmber(pid);
 	}
+
+	@Override
+	public List<Map<String, Object>> selectCount() {
+		return baseMapper.selectCount();
+	}
 }

--
Gitblit v1.9.3