From cbc15bffc95c486ec8fe67270d8d4e08de7b1407 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 06 May 2024 14:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/model/entity/LotInfo.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
index fc225a2..f637dff 100644
--- a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
+++ b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
@@ -5,6 +5,7 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+
import java.io.Serializable;
@Data
@@ -16,6 +17,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+
+ @TableField("workspace_id")
+ private String workspaceId;
@TableField("bsm")
private String bsm;
@@ -59,11 +63,13 @@
@TableField("sjlx")
private String sjlx;
+ @TableField("isplan")
+ private int isplan;
- @TableField("create_time")
- private int createTime;
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Long createTime;
- @TableField("update_time")
- private int updateTime;
+ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ private Long updateTime;
}
\ No newline at end of file
--
Gitblit v1.9.3