Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -327,12 +327,11 @@
                cto.student_id_ as studentId,
                cto.type_ as type,
                case cto.type_
-                    WHEN 'DAY' THEN '天'
+					WHEN 'DAY' THEN '天'
                     WHEN 'MONTH' THEN '月'
                     WHEN 'QUARTERLY' THEN '季'
                     WHEN 'YEAR_HALF' THEN '半年'
                     WHEN 'YEAR' THEN '年' ELSE ''
-                   else ''
                end as typeName,
                cto.time_ as time,
                sj.id_ as subject,