From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
index a308627..55800aa 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* 鎶ュ
@@ -34,15 +33,11 @@
private Integer peopleId;
@ApiModelProperty("鐐逛綅ID")
- @TableField("point_id")
- private Integer pointId;
+ @TableField("serial_number")
+ private String serialNumber;
@TableField("report_type")
private String reportType;
-
- @ApiModelProperty("瀹℃牳鏃堕棿")
- @TableField("auditing_time")
- private Date auditingTime;
@ApiModelProperty("鎶ュ鍐呭")
@TableField("report_content")
@@ -56,5 +51,23 @@
@TableField("error_type")
private String errorType;
+ @ApiModelProperty("鐘舵��: 0锛氭湭瀹℃牳锛�1锛氬鏍搁�氳繃锛�2锛氬鏍搁┏鍥�")
+ @TableField("status")
+ private Integer status;
+ @ApiModelProperty("鐢熸晥鏃堕棿")
+ @TableField("begin_create_time")
+ private Date beginCreateTime;
+
+ @ApiModelProperty("澶辨晥鏃堕棿")
+ @TableField("end_create_time")
+ private Date endCreateTime;
+
+ /** 鏍囪瘑鍙凤細鍙敤浜庢煡璇㈠巻鍙插鏍歌褰� */
+ @TableField("identify")
+ private String identify;
+
+ /** 瀵煎叆鎵规鍙� */
+ @TableField("import_batch_number")
+ private String importBatchNumber;
}
--
Gitblit v1.8.0