Merge remote-tracking branch 'origin/dev'

xiangpei

2024-07-09 c2cd507da74f1841d0133d4c9bff9025ce1066ba

 src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditVO.java

@@ -17,6 +17,8 @@
    @NotNull
    private Integer questionType;
    @ExcelImport("课目")
    private String sbNames;

    private String subjectName;
    //    年级学科表
    @NotNull
@@ -65,6 +67,13 @@
    private String d;


    public String getSbNames() {
        return sbNames;
    }

    public void setSbNames(String sbNames) {
        this.sbNames = sbNames;
    }

    public String getType() {
        return type;