Merge remote-tracking branch 'origin/master'

business/src/main/java/com/fizz/business/domain/LogData.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -28,30 +29,30 @@ public class LogData {
     @Schema(description ="timestamp")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date timestamp;
+    private LocalDateTime timestamp;
 
     /**
      * module
      */
-    @Schema(description ="module")
+    @Schema(description ="警报源")
     private String module;
 
     /**
      * logtype
      */
-    @Schema(description ="logtype")
+    @Schema(description ="警报类型，组")
     private String logtype;
 
     /**
      * logtext
      */
-    @Schema(description ="logtext")
+    @Schema(description ="警报内容")
     private String logtext;
 
     /**
      * status
      */
-    @Schema(description ="status")
+    @Schema(description ="状态")
     private Integer status;
 
     /**