Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -14,6 +14,7 @@
        signInOrNot,
        reservationStatus
        from t_course_package_student where coursePackageSchedulingId = #{coursePackageSchedulingId}
        and reservationStatus != 3
        <if test="null != userId">
            and appUserId in
            <foreach collection="appUserId" item="item" index="index" separator="," open="(" close=")">
@@ -46,11 +47,11 @@
        SELECT
            *,
            pg.NAME AS className,
            ty.`name` AS classType
            pg.`type` AS classType
        FROM
            t_course_package_payment py
                LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id
                LEFT JOIN t_course_package_type ty ON pg.type = ty.id


        <where>
            <if test="null != tStudentId">