Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-18 ad88668b0dc528de1cc982b7d0e146a14767b24e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ycl/jxkg/controller/student/MeetController.java

 src/main/java/com/ycl/jxkg/domain/vo/FinishedQuestion.java

@@ -21,4 +21,7 @@
    /** 得分 */
    private BigDecimal score;

    /** 是否做了 */
    private Boolean finished;

}