--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/order/ExportClassNameVo.java

 package com.zrqx.core.vo.schoolsysuser.fg.order;
 
-import com.zrqx.core.util.excelutil.ExcelResources;
 import com.zrqx.core.util.excelutil.ExcelSheetParams;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ExcelSheetParams(startRow = 2)
 public class ExportClassNameVo {
 	
-	@ExcelResources(title="班级名称")
+	@ApiModelProperty("学级")
+	private Integer academicLevel;
+	@ApiModelProperty("班级名称")
 	private String className;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/order/OrderInfoVo.java

@@ -38,6 +38,9 @@ public class OrderInfoVo extends OrderInfo{
 	private String majorName;
 	@ApiModelProperty("分担列表id")
 	private Integer splitOrderId;
+	@ApiModelProperty("学级+班级名称（根据学级跟班级名称去重）")
+	private String duplicate;
+