Merge remote-tracking branch 'langye/master'

src/views/attendance/overtimechart.vue

@@ -156,7 +156,7 @@
             overtimeItem.pid = id;
             overtimeItem.name = name;
             overtimeItem.department_name = department.name
-            overtimeItem.allDay = allDay;
+            overtimeItem.allDay = parseFloat(allDay).toFixed(2);
             result.push(overtimeItem);
           });
         });