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/mapper/catalogMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
index af232ea..86d82c8 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
@@ -39,5 +39,5 @@
 	List<Map<String, Object>> selectEq();
 	List<Map<String, Object>> selectWar();
 
-	String selectCatalogEqNUmber(String pid);
+	List selectCatalogEqNUmber(String pid);
 }

--
Gitblit v1.9.3