From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 f0e710f..93d08bb 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
@@ -33,8 +33,8 @@
     private Integer peopleId;
 
     @ApiModelProperty("鐐逛綅ID")
-    @TableField("point_id")
-    private Integer pointId;
+    @TableField("serial_number")
+    private String serialNumber;
 
     @TableField("report_type")
     private String reportType;
@@ -71,7 +71,11 @@
     @TableField("end_create_time")
     private Date endCreateTime;
 
-    /** 鐗堟湰鍙凤細鍙敤浜庢煡璇㈠巻鍙插鏍歌褰� */
-    @TableField("version")
-    private Integer version;
+    /** 鏍囪瘑鍙凤細鍙敤浜庢煡璇㈠巻鍙插鏍歌褰� */
+    @TableField("identify")
+    private String identify;
+
+    /** 瀵煎叆鎵规鍙� */
+    @TableField("import_batch_number")
+    private String importBatchNumber;
 }

--
Gitblit v1.8.0