Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

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

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

import lombok.Getter;
import lombok.Setter;

@Getter
@Setter
public class ExamItemOrderAndContent {