Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigVo.java

@@ -24,10 +24,12 @@ public class OrderBusinessConfigVo {
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long id;
 
+	/** 教育类型id */
+	private Long educationTypeId;
 	/** 业务层次id */
-	@Excel(name = "业务层次id")
-	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	/** 项目ID */
+	private Long projectId;
 	/** 配置名称 */
 	@Excel(name = "配置名称")
 	@ApiModelProperty("配置名称")

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

@@ -17,7 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderBusinessConfigVo" id="OrderBusinessConfigVoResult">
         <result property="id" column="id"/>
+        <result property="educationTypeId" column="education_type_id"/>
         <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
         <result property="configName" column="config_name"/>
         <result property="aliasName" column="alias_name"/>
         <result property="businessName" column="business_name"/>
@@ -33,7 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cb.alias_name,
         cb.business_name,
         cpt.project_name,
-        cet.education_name
+        cet.education_name,
+        cpt.education_id,
+        cpt.project_id
         FROM
         order_business_config obc
         LEFT JOIN course_business cb ON obc.business_id = cb.id