From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxStepDO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxStepDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxStepDO.java
index 7ee9263..6e6e248 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxStepDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxStepDO.java
@@ -1,10 +1,10 @@
package cn.gistack.sm.sg.DO;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serializable;
@@ -21,6 +21,9 @@
@Getter
@Setter
@TableName("SG_GX_STEP")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
public class SgGxStepDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,4 +50,13 @@
* 介绍
*/
private String remark;
+
+ @TableField(exist = false)
+ private Integer approvalStatus;
+
+ @TableField(exist = false)
+ private Long deviceId;
+
+ @TableField(exist = false)
+ private String gxType;
}
--
Gitblit v1.9.3