Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -21,7 +21,7 @@
 		t.id_ as id
         , t.user_id_ as userId
         , t.video_url_ as videoUrl
-        , t.describe_ as describe
+        , t.describe_ as `describe`
         , t.browse_ as browse
         , t.audit_version_ as auditVersion
         , t.auth_status_ as authStatus