Merge branch 'master' into test

# Conflicts:
#	device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

device-api/src/main/java/com/xy/dto/DeviceChargingDto.java

@@ -22,6 +22,19 @@ import java.util.List;
  */
 public class DeviceChargingDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class UpdateTimeout {
+
+        @ApiModelProperty(value = "设备id")
+        private List<Long> deviceIds;
+
+        @ApiModelProperty(value = "过期时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime timeout;
+
+    }
+
     @Data
     @Accessors(chain = true)
     public static class SelectList {