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/SgGxDO.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxDO.java
new file mode 100644
index 0000000..c656802
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgGxDO.java
@@ -0,0 +1,77 @@
+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.*;
+import lombok.experimental.Accessors;
+import org.springblade.core.tool.utils.DateUtil;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 施工工序基本表
+ * </p>
+ *
+ * @author shenyijian
+ * @since 2024-06-13 15:46:18
+ */
+@Getter
+@Setter
+@TableName(value ="SG_GX" ,autoResultMap = true)
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SgGxDO   {
+	@TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 工序基本名称
+     */
+    private String gxName;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private String gxType;
+
+	/**
+	 * 关联设备
+	 */
+	@TableField(exist = false)
+	private List<SgDeviceDO> deviceDOS;
+
+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	private String createUserName;
+
+
+	public void setCreateUpdateTime(){
+		Date now = DateUtil.now();
+		if (this.getId()== null) {
+			this.createTime = now;
+		}
+		this.updateTime = now;
+	}
+
+}

--
Gitblit v1.9.3