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

src/main/java/org/rcisoft/business/bcourse/dao/BCourseRepository.java

@@ -93,4 +93,4 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
             "</foreach>" +
             "</script>")
     int sortCourser(@Param("map") List<BCourse> map);
-}
+}
\ No newline at end of file

src/main/java/org/rcisoft/business/bcourse/dto/QueryCourseResDTO.java

@@ -20,4 +20,13 @@ public class QueryCourseResDTO {
 
     @ApiModelProperty(value = "子章节")
     private List<BCourse> children;
+
+    @ApiModelProperty(value = "序号")
+    private int sort;
+
+    @ApiModelProperty(value = "序号")
+    private String pid;
+
+    @ApiModelProperty(value = "等级")
+    private  String courseLevel;
 }

src/main/resources/mapper/business/bcourse.mapper/BCourseMapper.xml

@@ -19,6 +19,9 @@
     <resultMap id="BaseResultMapDTO" type="org.rcisoft.business.bcourse.dto.QueryCourseResDTO">
         <id column="business_id" jdbcType="VARCHAR" property="key"/>
         <result column="c_name" jdbcType="VARCHAR" property="title"/>
+        <result column="sort" jdbcType="VARCHAR" property="sort"/>
+        <result column="pid" jdbcType="VARCHAR" property="pid"/>
+        <result column="course_level" jdbcType="VARCHAR" property="courseLevel"/>
     </resultMap>
 
     <resultMap id="ChildListResultMap" type="org.rcisoft.business.bcourse.dto.QueryCourseResDTO" extends="BaseResultMapDTO">