Merge remote-tracking branch 'origin/master'

fuliqi

2024-05-31 4a2eea196bbd16ea4237bdc25e5fd501e24e6049

 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;