From 5f7716b3b9d60bf7e289ba2261730b4185210f57 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 13 六月 2024 17:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/QuestionMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 691aa92..80ee354 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -23,8 +23,13 @@
             parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO">
         SELECT
         tq.*,
-        CASE WHEN tq.question_type = 1 THEN '鍗曢�夐' WHEN tq.question_type = 2 THEN '澶氶�夐' WHEN tq.question_type = 3 THEN
-        '鍒ゆ柇棰�' WHEN tq.question_type = 4 THEN '濉┖棰�' WHEN tq.question_type = 5 THEN '绠�绛旈' END AS questionTypeName,
+        CASE WHEN tq.question_type = 1 THEN '鍗曢�夐'
+        WHEN tq.question_type = 2 THEN '澶氶�夐'
+        WHEN tq.question_type = 3 THEN '鍒ゆ柇棰�'
+        WHEN tq.question_type = 4 THEN '濉┖棰�'
+        WHEN tq.question_type = 5 THEN '绠�绛旈'
+        WHEN tq.question_type = 6 THEN '璇煶棰�'
+        END AS questionTypeName,
         ts.name AS subjectName,
         tu.real_name AS createUserName
         FROM t_question tq

--
Gitblit v1.8.0