From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index 60eb69d..2348bd0 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -7,7 +7,7 @@
         SELECT
         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,
         exam_name examName,bu.real_name securityName,company,exam_time examTime,
-        all_score allScore,exam_end_time examEndTime,qualified,
+        all_grade allGrade,exam_end_time examEndTime,qualified,
         bd.dept_name companyName
         FROM
         exam_score es

--
Gitblit v1.9.3