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

diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index 78f2d5e..e6f1a06 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -52,9 +52,9 @@
 	List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
 	List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
 	List<Map<Object,Object>> selectDis(String deptid);
-	List<Map<Object,Object>> selectDisp(String deptid);
+	List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
 	List<Map<Object,Object>> selectSoil(String deptid);
-	Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
+	List queryYearKh(String year,String jurisdiction,String deptid);
 
 	/**
 	 * 查询培训单位信息(可以报名)

--
Gitblit v1.9.3