Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -136,7 +136,7 @@
         `icss_question_info` a
         WHERE
         a.is_deleted = 'N'
-        AND a.type = #{type}
+        AND a.type = #{type} AND a.tag_type != 8
         <if test="moduleId != null and moduleId != ''">
             AND a.id NOT IN (
             SELECT