From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/ProfessionService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/ProfessionService.java b/src/main/java/com/moral/service/ProfessionService.java
index 289dbc9..d57105c 100644
--- a/src/main/java/com/moral/service/ProfessionService.java
+++ b/src/main/java/com/moral/service/ProfessionService.java
@@ -1,12 +1,15 @@
package com.moral.service;
-import com.moral.entity.Profession;
-
import java.util.List;
+import java.util.Map;
+
+import com.moral.entity.Profession;
public interface ProfessionService {
List<Profession> queryByName(String nameLike);
public List<Profession> getProfessiontList();
+
+ public List<Profession> getProfessiontList(Map<String, Object> parameters);
}
--
Gitblit v1.8.0