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

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java

@@ -58,8 +58,8 @@
    /**
     * 问题内容
     */
    @TableField("question_text_content_id")
    private Integer questionTextContentId;
    @TableField("questionContent")
    private String questionContent;

    /**
     * 做题答案