Merge remote-tracking branch 'origin/master'

44323

2023-09-26 7aa9607492e2c0b70838c53083f5362e49e74f44

 cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml

@@ -17,14 +17,14 @@


    <select id="queryCoursePackageSchedulingList" resultType="map">
        select
        CAST(id AS CHAR(20)) as id,
        DATE_FORMAT(classDate, '%Y-%m-%d') as classDate,
        courseId,
        `status`,
        cancelClasses,
        deductClassHour,
        integral
        from t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
        SELECT
            CAST(id AS CHAR(20)) AS id,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
            courseId,
            `status`,
            cancelClasses,
            deductClassHour,
            integral
        FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
    </select>
</mapper>