Merge branch 'dev_routine_work' into dev

4 years ago · fcc25cdce8
1 changed files with 2 additions and 2 deletions
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java
+++ b/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 = {"巡查时长(小时)"})
-    private double totalTime;
+    @ExcelProperty(value = {"巡查时长"})
+    private String totalTime;

    @ExcelProperty(value = {"例行工作次数"})
    private int patrolRoutineWorkTimes;