Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

4 years ago · a5b7e0e5e3
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java
@ -48,7 +48,7 @@ public class CustomerDataManageExcel {
    private String patrolDuration;

    @Excel(name = "例行工作次数")
-    private String patrolRoutineWorkTimes;
+    private Integer patrolRoutineWorkTimes;

    /**
     * 未转换前的巡查时长