Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-07 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635

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

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

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

    void terminateContract(String empIds, String operatorId);
}