Merge branch 'master' into dev-xym-long-article

# Conflicts:
#	long-article-server/src/main/resources/mybatis-generator-config.xml

long-article-server/src/main/resources/mybatis-generator-config.xml

@@ -50,6 +50,7 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <table tableName="video_content_understanding" domainObjectName="VideoContentUnderstanding" alias="" />
+<!--        <table tableName="long_articles_match_videos" domainObjectName="MatchVideo" alias="" />-->
 <!--            <columnOverride column="response" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
 <!--        </table>-->
 <!--        <table tableName="long_articles_text" domainObjectName="LongArticlesText" alias="">-->