From 939292b1cfd4fb4f714bb5ae09dbc2220cef06b4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 27 Feb 2021 19:10:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
index cc48181..1e85d35 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java
@@ -37,7 +37,7 @@
 	List<Map<String, Object>> selectEq();
 	List<Map<String, Object>> selectWar(String beginTime,String endTime);
 
-	List selectCatalogEqNUmber(String pid);
+	List<Map<String, Object>> selectCatalogEqNUmber();
 
 	List<catalogVO> lazyTree(String tenantId, Long parentId);
 }

--
Gitblit v1.9.3