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

zc-business/src/main/resources/mapper/business/DcInfoBoardVocabularyMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDcInfoBoardVocabularyList" parameterType="DcInfoBoardVocabulary" resultMap="DcInfoBoardVocabularyResult">
         <include refid="selectDcInfoBoardVocabularyVo"/>
         <where>  
-            <if test="word != null  and word != ''"> and word = #{word}</if>
+            <if test="word != null  and word != ''"> and word like concat('%', #{word}, '%')</if>
         </where>
     </select>