From a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 15:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index ea19ee5..279dea6 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -6,7 +6,7 @@
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
- sa.examination_type examinationType,sa.examination_mx examinationMx,sa.audit_status auditStatus,
+ sa.examination_type examinationType,sa.examination_mx examinationMx,ke.audit_status auditStatus,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
bu.real_name realName,bu.is_apply isApply,
bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
--
Gitblit v1.9.3