From 83bed9e77878cbe11e797b58fa2c2a48061e4555 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into 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 8343697..d157ac9 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
@@ -33,7 +33,7 @@
 	List<Map<String, Object>> selectCount();
 	List<Map<String, Object>> selectAddvcd();
 	List<Map<String, Object>> selectEq();
-	List<Map<String, Object>> selectWar();
+	List<Map<String, Object>> selectWar(String beginTime,String endTime);
 
 	List selectCatalogEqNUmber(String pid);
 }

--
Gitblit v1.9.3