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/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