Merge branch 'master' into prod

device-api-service/src/main/java/com/xy/entity/DeviceErrorsRecord.java

@@ -40,6 +40,9 @@ public class DeviceErrorsRecord implements Serializable {
     @ApiModelProperty(value = "故障编码")
     private String code;
 
+    @ApiModelProperty(value = "故障内容")
+    private String errorMsg;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

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

@@ -86,6 +86,9 @@ public class DeviceErrorsRecordDto {
         @ApiModelProperty(value = "故障编码")
         private String code;
 
+        @ApiModelProperty(value = "故障内容")
+        private String errorMsg;
+
         @ApiModelProperty(value = "创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;