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/dto/DataReportHead.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/dto/DataReportHead.java b/src/main/java/com/ots/project/exam/dto/DataReportHead.java
index b8ca68e..4e368e8 100644
--- a/src/main/java/com/ots/project/exam/dto/DataReportHead.java
+++ b/src/main/java/com/ots/project/exam/dto/DataReportHead.java
@@ -1,27 +1,22 @@
package com.ots.project.exam.dto;
-
import lombok.Getter;
import lombok.Setter;
-
import java.util.ArrayList;
import java.util.List;
-
@Getter
@Setter
public class DataReportHead {
- private List<Object> headSystem; // 绗竴琛岀殑鍒�
- private List<Object> headEnglish; // 绗簩琛岀殑鍒�
- private List<Object> headChinese;// 绗笁琛岀殑鍒�
- private List<Object> headThai;// 绗笁琛岀殑鍒�
- private List<Object> headRight; // 娌℃湁鏉冮檺灏卞幓鎺�
-
+ private List<Object> headSystem;
+ private List<Object> headEnglish;
+ private List<Object> headChinese;
+ private List<Object> headThai;
+ private List<Object> headRight;
public DataReportHead() {
headSystem = new ArrayList<>();
headEnglish = new ArrayList<>();
headChinese = new ArrayList<>();
headThai = new ArrayList<>();
headRight = new ArrayList<>();
-
headChinese.add("瀵煎嚭鍚庡彉閲忓悕锛堜腑鏂囷級");
headSystem.add("绯荤粺鍐呭彉閲忓悕");
headEnglish.add("瀵煎嚭鍚庡彉閲忓悕锛堣嫳鏂囷級");
--
Gitblit v1.9.1