From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
index b61ec5f..4c6035e 100644
--- a/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
+++ b/src/main/java/com/mindskip/xzs/vo/QuestionImportVO.java
@@ -1,14 +1,13 @@
package com.mindskip.xzs.vo;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
-import io.swagger.models.auth.In;
+import com.mindskip.xzs.domain.vo.QuestionSubjectVO;
import lombok.Data;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.springframework.util.StringUtils;
import java.util.List;
@@ -28,9 +27,20 @@
@ExcelProperty("璇剧洰(澶氫釜鐢ㄣ�侀殧寮�)")
private String subjectName;
+ @ExcelIgnore
+ private List<Integer> subjectIds;
+ @ExcelIgnore
+ private List<String> subjectList;
+
@ColumnWidth(80)
@ExcelProperty("棰樺共")
private String title;
+
+ /***
+ * 棰樼洰鍐呭
+ */
+ @ExcelIgnore
+ private String questionContent;
// 閫夐」鍐呭
@ExcelProperty({"棰樼洰閫夐」", "閫夐」"})
@@ -46,7 +56,6 @@
@ColumnWidth(30)
@ExcelProperty("瑙ｆ瀽")
private String analyze;
-
// 棰樼洰鍒嗘暟
@ExcelProperty("棰樼洰鍒嗘暟")
--
Gitblit v1.8.0