Merge branch 'dev_routine_work' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java

@@ -47,8 +47,8 @@ public class GridMemberDataAnalysisExcelExportBean {
     @ExcelProperty(value = {"巡查次数"})
     private int patrolTimes;
 
-    @ExcelProperty(value = {"巡查时长(小时)"})
+    @ExcelProperty(value = {"巡查时长"})
-    private double totalTime;
+    private String totalTime;
 
     @ExcelProperty(value = {"例行工作次数"})
     private int patrolRoutineWorkTimes;