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/impl/CatalogServiceImpl.java |    2 +-
 1 files changed, 1 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 ce8dca1..1de5130 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,7 @@
 	}
 
 	@Override
-	public String selectCatalogEqNUmber(String pid) {
+	public List selectCatalogEqNUmber(String pid) {
 		return baseMapper.selectCatalogEqNUmber(pid);
 	}
 

--
Gitblit v1.9.3