From 99081be70e456268640014a6369c55c5fec29f2d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 28 Aug 2021 14:38:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index e3b1927..a11dd3d 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -61,5 +61,5 @@
* @return
*/
List<InformationVO> securityPage(IPage<InformationVO> page, @Param("information") InformationVO information);
- Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
+ List queryYearKh(String year,String jurisdiction,String deptid);
}
--
Gitblit v1.9.3