renqianlong пре 1 година
родитељ
комит
32d95cc1a0

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CompanyOrderBusinessConfigGoodsVo.java

@@ -60,7 +60,7 @@ public class CompanyOrderBusinessConfigGoodsVo {
 	@ApiModelProperty("教育类型名称")
 	private String educationName;
 	@ApiModelProperty("教育类型id")
-	private Long educationTypeId;
+	private Long educationType;
 	@ApiModelProperty("项目名称")
 	private String projectName;
 	/** 配置名称 */

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

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="configName" column="config_name"/>
         <result property="mainImg" column="main_img"/>
         <result property="businessId" column="businessId"/>
-        <result property="educationTypeId" column="educationTypeId"/>
+        <result property="educationType" column="educationType"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsConfigVo" id="GoodsResultVo">
@@ -213,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         obc.main_img,
         any_value ( obc.config_name ) config_name,
         group_concat( bcg.goods_ids ) goods_ids,
-        cet.id AS educationTypeId,
+        cet.id AS educationType,
         cet.education_name,
         cb.business_name,
         cb.id AS businessId,