From 2c89f5c73fb364f2510d9fb4c8407395b4f959f4 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Mon, 26 Aug 2024 16:36:10 +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/SgStepReportVO.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStepReportVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStepReportVO.java
index 28796bc..b1d8e9f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStepReportVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStepReportVO.java
@@ -13,4 +13,5 @@
 private String 	stepNum;
 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 private Date reportTime;
+private Integer resubmit;
 }

--
Gitblit v1.9.3