Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 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);
}