Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

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

@@ -19,7 +19,7 @@
    <select id="queryCoursePackageSchedulingList" resultType="map">
        SELECT
            CAST(id AS CHAR(20)) AS id,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), DATE_FORMAT(endDate, '%H:%i')) AS classDate,
            courseId,
            `status`,
            cancelClasses,