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

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java
new file mode 100644
index 0000000..89c09cb
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProgressReportVO.java
@@ -0,0 +1,23 @@
+package cn.gistack.sm.sg.VO;
+
+import cn.gistack.sm.sg.DO.SgProgressReportDO;
+import cn.gistack.sm.sg.DO.SgReportUserDO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SgProgressReportVO extends SgProgressReportDO {
+	/**
+	 * 各级审批流程
+	 */
+	private List<SgReportUserDO> sgReportUserDOS;
+	/**
+	 * 同设备流程审批情况
+	 */
+	private List<SgStepReportVO> sgStepReportVOS;
+
+	private Integer approvalStatus;
+
+	private String stepRemark;
+}

--
Gitblit v1.9.3