Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-01 1c7cb9c300fda246db57ef5c43d118c7eaef22d6

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

@@ -135,7 +135,7 @@

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpBadRecord(List<List<Object>> listObject) {
    public void importEmpRemarkInfo(List<List<Object>> listObject) {
       for (List<Object> list : listObject) {
          EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
          empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));