Merge branch 'master' into test

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

@@ -56,8 +56,10 @@ public class DeviceChargingDto {
         @ApiModelProperty("状态类型 字典=device_charging_query_type")
         private Integer chargingStatus;
 
+        @ApiModelProperty(hidden = true)
         private LocalDateTime thisTime;
 
+        @ApiModelProperty(hidden = true)
         private LocalDateTime theTime;
     }