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

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperMarkVO.java

@@ -37,6 +37,6 @@
    private BigDecimal deductScore;
    /** 题目 */
    private List<PaperFixQuestionVO> titleItems;
    /** 答案集合(用于前端跳转对应题目) */
    private List<ExamPaperMarkAnswerVO> answers;
    /** 题目集合(用于前端跳转对应题目) */
    private List<ExamPaperMarkNavbarVO> navbar;
}