Merge remote-tracking branch 'origin/master'

yz

2021-03-09 dfed60326c07756d3710d74c3aa44b537602adda

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
 * name:EmpDimissionlog
@@ -25,7 +26,7 @@
     * @param empDimissionlog empDimissionlog
     * @return IPage<EmpDimissionlog>
     */
    IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog);
    IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog);

    /**
     * 查询（所有）