Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 531a0c28dbabde3e9e2ee2598e0448cf323c9b94

 src/main/java/com/ycl/jxkg/domain/enums/QuestionTypeEnum.java

@@ -9,8 +9,8 @@
    MultipleChoice(2, "多选题"),
    TrueFalse(3, "判断题"),
    GapFilling(4, "填空题"),
    ShortAnswer(5, "简答题");

    ShortAnswer(5, "简答题"),
    Calculation(6,"计算题");
    int code;
    String name;