修复小BUG

jjt-biz/src/main/java/com/jjt/calc/domain/TwinCalcDay.java

@@ -106,14 +106,12 @@ public class TwinCalcDay extends BaseEntity {
      * 总电量
      */
     @ApiModelProperty("总电量")
-    @Excel(name = "总电量")
     private BigDecimal kwh;
 
     /**
      * 告警数量
      */
     @ApiModelProperty("告警数量")
-    @Excel(name = "告警数量")
     private Long alarm;
 
     /**
@@ -155,7 +153,6 @@ public class TwinCalcDay extends BaseEntity {
      * A班电量
      */
     @ApiModelProperty("A班电量")
-    @Excel(name = "A班电量")
     private BigDecimal kwhA;
 
     /**
@@ -218,7 +215,6 @@ public class TwinCalcDay extends BaseEntity {
      * B班电量
      */
     @ApiModelProperty("B班电量")
-    @Excel(name = "B班电量")
     private BigDecimal kwhB;
 
     /**

jjt-biz/src/main/java/com/jjt/utils/Tools.java

@@ -47,7 +47,7 @@ public class Tools {
      * Alarm_unit_26	BOOL	拍照自停
      * Alarm_unit_27	UINT	CCD位置报警信息显示
      */
-    public static final int[] ALLOW_ALARM = {8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 26};
+    public static final int[] ALLOW_ALARM = {8, 10, 11, 12, 13, 14, 15, 16, 17, 18};
 
     /**
      * 查找编号是否允许告警