fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsConfigVo.java

@@ -68,4 +68,7 @@ public class GoodsConfigVo {
 
 	@ApiModelProperty("科目名称拼接")
 	private String subjectNames;
+
+	@ApiModelProperty("年份")
+	private Long year;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserImportAddBo.java

@@ -45,8 +45,8 @@ public class UserImportAddBo {
     @ApiModelProperty("学历")
     private String eduLevel;
 
-    @Excel(name = "商品年份")
-    @ApiModelProperty("商品年份")
+    @Excel(name = "年份")
+    @ApiModelProperty("年份")
     private String year;
 
     @Excel(name = "失败原因")

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigGoodsMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeName" column="class_name"/>
         <result property="officialName" column="official_name"/>
         <result property="subjectNames" column="subject_names"/>
+        <result property="year" column="year"/>
     </resultMap>
 
     <select id="findGoodsList" resultMap="GoodsResultVo">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             m.category_name,
             g.stand_price,
             g.lowest_price,
+               g.year,
         (select cg.grade_id from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) grade_id,
         (select cg.class_name from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) class_name,
         (select cg.official_name from class_grade  cg  LEFT JOIN class_grade_goods gg on cg.grade_id = gg.grade_id where gg.goods_id = g.goods_id and (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper  limit 1) official_name,