Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 736b58a43b0afb40745f885f400ef97d070f46a9

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

@@ -79,5 +79,5 @@
     */
    boolean momentToNormal(String ids);

   void importEmpBadRecord(List<List<Object>> listObject);
   void importEmpBadRecord(List<List<Object>> listObject,List<String>  returnList);
}