Merge branch 'meiteng-2.0' into master-1.0.2

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -171,6 +171,9 @@ public class BLesson extends IdEntity<BLesson> {
     @ApiModelProperty(value = "平台推荐自带标签")
     private String pushLabel;
 
+    @ApiModelProperty(value = "平台推荐自带标签")
+    private String pushLable;
+
     //-------------------------------------
 
     @ApiModelProperty(value = "学习进度")

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -232,8 +232,8 @@ public class BLessonServiceImpl implements BLessonService {
                 bLessonRepository.hotNumberReCount2(bLesson.getBusinessId());
         }
         //添加 推送至企业信息 标签信息
-        if (StringUtils.isNotEmpty(bLesson.getPushLabel())) {
-            String[] labels = bLesson.getPushLabel().split(",");
+        if (StringUtils.isNotEmpty(bLesson.getPushLable())) {
+            String[] labels = bLesson.getPushLable().split(",");
             List<QueryLabelResDTO> dto = bLabelRepository.queryPushLabel(labels);
             bLesson.setLabelList(dto);
         }

src/main/resources/mapper/business/blesson/mapper/BLessonMapper.xml

@@ -96,6 +96,7 @@
           <result column="value_gain" jdbcType="VARCHAR" property="valueGain"/>
           <result column="value_update_date" jdbcType="TIMESTAMP" property="valueUpdateDate"/>
           <result column="is_trans" jdbcType="VARCHAR" property="isTrans"/>
+          <result column="push_lable" jdbcType="VARCHAR" property="pushLable"/>
 
 
           <collection property="labelList" ofType="org.rcisoft.business.blabel.dto.QueryLabelResDTO"