Merge remote-tracking branch 'origin/master' into dev

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java

@@ -3,6 +3,7 @@ package com.shxy.xymanager_common.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 
@@ -54,7 +55,7 @@ public class TerminalsAndLineAndChannelDto implements Serializable {
 
     private Short signalStrength4g;
 
-    private Integer bootTime;
+    private BigInteger bootTime;
 
     private float batteryCapacity;
 

xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 
@@ -83,7 +84,7 @@ public class TerminalListModel implements Serializable {
         private Short signalStrength4g;
 
         @ApiModelProperty(value = "装置上次启动时间", example = "213")
-        private Integer bootTime;
+        private BigInteger bootTime;
 
         @ApiModelProperty(value = "电池电量", example = "213")
         private float batteryCapacity;