Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-09 97c5552f705e03a3a6e5864e3be6b1078844a4d3

 src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java

@@ -16,7 +16,7 @@

    private Integer createUser;

    private Integer subjectId;
    private Integer[] subjectId;

    private Integer paperType;

@@ -70,11 +70,11 @@
        this.createUser = createUser;
    }

    public Integer getSubjectId() {
    public Integer[] getSubjectId() {
        return subjectId;
    }

    public void setSubjectId(Integer subjectId) {
    public void setSubjectId(Integer[] subjectId) {
        this.subjectId = subjectId;
    }