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

fuliqi

2024-07-05 3179257af77acbc229fe873de7495e2d3f8dfb6e

 src/main/resources/mapper/StudyRecordMapper.xml

@@ -8,6 +8,7 @@
        <result column="student_id" property="studentId"/>
        <result column="study_time" property="studyTime"/>
        <result column="last_time" property="lastTime"/>
        <result column="meet_count" property="meetCount"/>
    </resultMap>