Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -63,7 +63,7 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      */
     Subject getSubjectMatchByName(@Param("name") String subjectName);
 
-    Subject getByCbsId(Integer subjectId);
+    Subject getByCbsId(@Param("subjectId") Integer subjectId);
 
-    List<CbsSubjectApiWrapper.Subject> queryCbsList(CbsSubjectApiWrapper.SubjectQuery query);
+    List<CbsSubjectApiWrapper.Subject> queryCbsList(@Param("query") CbsSubjectApiWrapper.SubjectQuery query);
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -209,7 +209,7 @@
         SELECT * FROM subject WHERE del_flag_ = 0 and name_ LIKE CONCAT('%', #{name}, '%') LIMIT 1
     </select>
     <select id="getByCbsId" resultType="com.yonge.cooleshow.biz.dal.entity.Subject">
-        SELECT * FROM `subject` WHERE cbs_subject_id_ = #{cbsSubjectId} AND del_flag_ = 0 LIMIT 1
+        SELECT * FROM `subject` WHERE cbs_subject_id_ = #{subjectId} AND del_flag_ = 0 LIMIT 1
     </select>
     <select id="queryCbsList"
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper$Subject">