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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 1db872f..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
@@ -18,6 +18,9 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+    @TableField("workspace_id")
+    private String workspaceId;
+
     @TableField("bsm")
     private String bsm;
 
@@ -60,6 +63,9 @@
     @TableField("sjlx")
     private String sjlx;
 
+    @TableField("isplan")
+    private int isplan;
+
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Long createTime;
 

--
Gitblit v1.9.3