Merge branch 'dev'

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -915,7 +915,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             CASE
                 WHEN cg.class_status = 1 THEN '已开班'
                 WHEN cg.class_status = 0 THEN '未开班'
-                ELSE '其他' END AS classStatus,
+                ELSE '其他' END AS gradeStatus,
             FROM_UNIXTIME( cg.class_start_time, '%Y-%m-%d %H:%i:%s' ) AS startTime,
             FROM_UNIXTIME( cg.class_end_time, '%Y-%m-%d %H:%i:%s' ) AS endTime,
             cg.student_upper AS upperNum,