Merge remote-tracking branch 'origin/tai-ots-master-20210316' into Dev

linzhijie

2021-03-24 8e76fba031022a2bb99795a2678c62db33a5ebfd

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

@@ -1,8 +1,13 @@
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;

}