From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 src/main/java/com/ots/project/exam/viewmodel/ExamItemOrderAndContent.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/viewmodel/ExamItemOrderAndContent.java b/src/main/java/com/ots/project/exam/viewmodel/ExamItemOrderAndContent.java
index a772075..d25dea3 100644
--- a/src/main/java/com/ots/project/exam/viewmodel/ExamItemOrderAndContent.java
+++ b/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 {

--
Gitblit v1.9.1