Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -87,6 +87,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         Long aLong = null;
         try {
             aLong = computeTime(approvalInformation.getLeaveStartTime(), approvalInformation.getLeaveEndTime());
+            System.out.println(aLong);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -238,8 +239,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 }
             }
         }
-        approvalInformationDao.save(approvalInformation);
-        return approvalInformation;
+        return approvalInformationDao.save(approvalInformation);
     }