Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/viewmodel/ExamPaperAnswerPageVM.java

@@ -1,13 +1,8 @@
package com.ots.project.exam.viewmodel;

import com.ots.project.exam.dto.BasePage;
import lombok.Data;

@Data
public class ExamPaperAnswerPageVM extends BasePage {

    private Integer subjectId;

    private Integer createUser;

}