Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1671,6 +1671,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             Optional<LeaveSheet> leaveSheet = leaveSheetList.stream().filter(ls -> ls.getOwnerId().equals(u.getId()) &&
                     ((localDate.isAfter(ls.getStartDate()) || localDate.isEqual(ls.getStartDate())) && (localDate.isBefore(ls.getEndDate()) || localDate.isEqual(ls.getEndDate())))).findFirst();
             if(leaveSheet.isPresent()){
+                user.put("leaveType",leaveSheet.get().getLeaveType());
                 if(leaveSheet.get().getTimeType()==0){
                     user.put("leaveDays",leaveSheet.get().getTimeDays());
                 }else user.put("leaveTimes",leaveSheet.get().getTimeHours());