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

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 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;
}