fix

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

@@ -458,4 +458,9 @@ public class GoodsUserVo {
 	private String sevenPushReason;
 
 	private String sevenPushDate;
+
+	/** 专业名称 */
+	@ApiModelProperty("专业名称")
+	@Excel(name = "专业")
+	private String majorName;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -227,6 +227,7 @@
         <result property="openGoodsTime" column="open_goods_time"/>
         <result property="oldOrderSn" column="old_order_sn"/>
         <result property="profileChangeStatus" column="profile_change_status"/>
+        <result property="majorName" column="major_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -557,6 +558,7 @@
         (SELECT cet.education_name FROM  course_education_type cet  where cet.id = g.education_type_id) as education_name,
         (SELECT cet.project_name FROM  course_project_type cet where cet.id = g.project_id) as project_name,
         (SELECT cet.business_name FROM  course_business cet  where cet.id = g.business_id) as business_name,
+        (SELECT m.category_name FROM  major m  where m.id = g.major_id) as major_name,
         (SELECT COUNT(1) FROM goods_course gc where gc.goods_id = g.goods_id) as course_num,
         <if test="querySign == null or querySign == 0">
             (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) >0 then 0 ELSE 1 end) as rebuild_status,