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/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 99dbac3..84077d9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -148,7 +148,8 @@
step.gx_step_name AS stepName,
step.gx_step_num AS stepNum,
re.STATUS AS approvalStatus,
- re.report_time
+ re.report_time,
+ re.resubmit
FROM
ywxt.sg_gx_step step
LEFT JOIN ywxt.sg_gx gx ON step.gx_info_id = gx.id
--
Gitblit v1.9.3