From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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/SgDeviceDO.java |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 110 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
new file mode 100644
index 0000000..72cab0c
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
@@ -0,0 +1,110 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 施工项目表
+ * </p>
+ *
+ * @author shenyijian
+ * @since 2024-06-13 11:51:20
+ */
+@Data
+@TableName("SG_DEVICE")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SgDeviceDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+	@TableId(type = IdType.AUTO)
+
+	private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+	/**
+	 * 类型名称
+	 */
+	@TableField(exist = false)
+	private String typeName;
+	/**
+	 * 设备进度
+	 */
+	@TableField(exist = false)
+	private String deviceProgress;
+
+	@TableField(exist = false)
+	private String progress;
+	/**
+	 * 项目id
+	 */
+	private String programId;
+
+	@TableField(exist = false)
+	private String programName;
+    /**
+     * 经度
+     */
+    private String lon;
+	/**
+	 * 纬度
+	 */
+	private String lat;
+
+
+    /**
+     * 安装地址
+     */
+    private String address;
+
+    /**
+     * 创建人
+     */
+	@TableField(exist = false)
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 工序步骤
+	 */
+	@TableField(exist = false)
+	private List<SgGxStepDO> stepDOList;
+    /**
+     * 修改时间
+     */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+
+	private Integer status;
+
+}

--
Gitblit v1.9.3