Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -268,12 +268,12 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         @ExcelProperty(value = "类型")
         private String type;
 
-        @ColumnWidth(25)
-        @ExcelProperty(value = "激活时间")
+        @ColumnWidth(50)
+        @ExcelProperty(value = "激活时间 yyyy-MM-dd HH:mm:ss")
         private String activateTime;
 
-        @ColumnWidth(25)
-        @ExcelProperty(value = "过期时间")
+        @ColumnWidth(50)
+        @ExcelProperty(value = "过期时间 yyyy-MM-dd HH:mm:ss")
         private String timeout;
 
     }