Merge remote-tracking branch 'origin/master'

yz

2021-03-10 512915919284d363b6a07fd6c9c54f145402fb0a

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

@@ -187,7 +187,7 @@
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
         }
         leaveInfo.setLeaveType(list.get(8).toString());
         leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
         if (StringUtils.isNotBlank(list.get(9).toString())) {
            leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
         }