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

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

@@ -310,7 +310,7 @@
     <select id="getStudentSubjectMapList" resultType="java.util.Map">
         SELECT stu.user_id_ 'key',sub.name_ 'value'
         FROM student stu
-        LEFT JOIN `subject` sub ON stu.subject_id_list_ = sub.id_
+        LEFT JOIN `subject` sub ON stu.subject_id_ = sub.id_
         WHERE stu.user_id_ IN
         <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
             #{studentId}