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

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java
new file mode 100644
index 0000000..49e8492
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java
@@ -0,0 +1,32 @@
+package cn.gistack.sm.sg.VO;
+
+import cn.gistack.sm.sg.DO.SgDeviceDO;
+import cn.gistack.sm.sg.DO.SgGxDO;
+import cn.gistack.sm.sg.DO.SgGxStepDO;
+import cn.gistack.sm.sg.DO.SgProjectInfoDO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+public class SgProjectInfoVO extends SgProjectInfoDO {
+	private Long id;
+	private String projectName;
+	private Long gxId;
+	private String gxName;
+	private String deviceName;
+	private Long dId;
+	private Long reportId;
+	private Long stepId;
+	private String gxStepName;
+	private Integer reportStatus;
+	private String gxStepNum;
+	private String deviceType;
+	private String typeName;
+	private Integer deviceStatus;
+	private Integer projectStatus;
+	private String progressName;
+}

--
Gitblit v1.9.3