fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/goods/bo/BsUserGoodsCollectionAddBo.java

@@ -48,7 +48,7 @@ public class BsUserGoodsCollectionAddBo {
     /** 商品名称 */
     private String goodsName;
     /** 教育类型 */
-    private Long educationType;
+    private Long educationTypeId;
     /** 项目id */
     private Long projectId;
     /** 项目名称 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/goods/bo/BsUserGoodsCollectionEditBo.java

@@ -50,7 +50,7 @@ public class BsUserGoodsCollectionEditBo {
     /** 商品名称 */
     private String goodsName;
     /** 教育类型 */
-    private Long educationType;
+    private Long educationTypeId;
     /** 项目id */
     private Long projectId;
     /** 项目名称 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/goods/bo/BsUserGoodsCollectionQueryBo.java

@@ -42,7 +42,7 @@ public class BsUserGoodsCollectionQueryBo extends BaseEntity {
 	/** 商品名称 */
 	private String goodsName;
 	/** 教育类型 */
-	private Long educationType;
+	private Long educationTypeId;
 	/** 教育类型 */
 	private Long companyId;
 	/** 教育类型 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/goods/domain/BsUserGoodsCollection.java

@@ -37,7 +37,7 @@ private static final long serialVersionUID=1L;
     /** 教育类型 */
     private Long companyId;
     /** 教育类型 */
-    private Long educationType;
+    private Long educationTypeId;
     /** 教育类型名称 */
     private String educationName;
     /** 项目id */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/goods/service/impl/BsUserGoodsCollectionServiceImpl.java

@@ -90,7 +90,7 @@ public class BsUserGoodsCollectionServiceImpl extends ServiceImpl<BsUserGoodsCol
         LambdaQueryWrapper<BsUserGoodsCollection> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getGoodsId() != null, BsUserGoodsCollection::getGoodsId, bo.getGoodsId());
         lqw.eq(bo.getGoodsType() != null, BsUserGoodsCollection::getGoodsType, bo.getGoodsType());
-        lqw.eq(bo.getEducationType() != null, BsUserGoodsCollection::getEducationType, bo.getEducationType());
+        lqw.eq(bo.getEducationTypeId() != null, BsUserGoodsCollection::getEducationTypeId, bo.getEducationTypeId());
         lqw.eq(bo.getEducationName() != null, BsUserGoodsCollection::getEducationName, bo.getEducationName());
         lqw.eq(bo.getProjectId() != null, BsUserGoodsCollection::getProjectId, bo.getProjectId());
         lqw.eq(bo.getProjectName() != null, BsUserGoodsCollection::getProjectName, bo.getProjectName());
@@ -217,7 +217,7 @@ public class BsUserGoodsCollectionServiceImpl extends ServiceImpl<BsUserGoodsCol
             OrderBusinessConfigVo detail = iOrderBusinessConfigService.getDetail(orderBusinessConfigQueryBo);
             add.setGoodsType(10L);
             add.setGoodsName(detail.getConfigName());
-            add.setEducationType(detail.getEducationType());
+            add.setEducationTypeId(detail.getEducationType());
             add.setEducationName(detail.getEducationName());
             add.setProjectId(detail.getProjectId());
             add.setProjectName(detail.getBusinessName()+detail.getProjectName());
@@ -240,7 +240,7 @@ public class BsUserGoodsCollectionServiceImpl extends ServiceImpl<BsUserGoodsCol
                 CompanyGoodsVo goods = list.get(0);
                 add.setGoodsType(goods.getGoodsType().longValue());
                 add.setGoodsName(goods.getGoodsName());
-                add.setEducationType(goods.getEducationTypeId());
+                add.setEducationTypeId(goods.getEducationTypeId());
                 add.setEducationName(goods.getEducationName());
                 add.setProjectId(goods.getProjectId());
                 add.setProjectName(goods.getBusinessName()+goods.getProjectName());

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

@@ -53,7 +53,7 @@ public class BsUserGoodsCollectionVo {
 	private String mainImg;
 	private String goodsName;
 	private String educationName;
-	private Long educationType;
+	private Long educationTypeId;
 	private String businessName;
 	private String projectName;
 	private String subjectName;

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 educationType;
+	private Long educationTypeId;
 	@ApiModelProperty("项目名称")
 	private String projectName;
 	/** 配置名称 */

zhongzheng-system/src/main/resources/mapper/modules/goods/BsUserGoodsCollectionMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="goodsName" column="goods_name"/>
         <result property="goodsType" column="goods_type"/>
-        <result property="educationType" column="education_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
         <result property="educationName" column="education_name"/>
         <result property="projectId" column="project_id"/>
         <result property="projectName" column="project_name"/>

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="educationType" column="educationType"/>
+        <result property="educationTypeId" column="educationTypeId"/>
     </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 educationType,
+        cet.id AS educationTypeId,
         cet.education_name,
         cb.business_name,
         cb.id AS businessId,