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/VO/SgProjectInfoVO.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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
index f7b08c0..08976a6 100644
--- 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
@@ -4,7 +4,10 @@
 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;
 
@@ -16,11 +19,17 @@
 	private String gxName;
 	private String deviceName;
 	private Long dId;
+	private Long reportId;
+	private Long stepId;
 	private String gxStepName;
-	private Integer STATUS;
+	private Integer reportStatus;
 	private String gxStepNum;
 	private String deviceType;
 	private String typeName;
 	private Integer deviceStatus;
+	private Integer projectStatus;
 	private String progressName;
+	private String Ptype;
+	private String PtypeName;
+	private Integer resubmit;
 }

--
Gitblit v1.9.3