Merge branch 'zyj-keyword' into 'master'

高峰期关键词回复

See merge request rays/pcloud-book!220

pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml

@@ -228,7 +228,8 @@
             bk.is_delete = 0 AND k.is_delete = 0
             AND classify_id in (0, ${classifyId})
             AND book_group_id = #{bookGroupId}
-            order by set_type desc, matching_rule desc, bk.id desc
+        GROUP BY k.id
+        order by set_type desc, matching_rule desc, bk.id desc
     </select>
 
     <select id="getKeywordIds" resultType="ReplyKeywordDTO" parameterType="map">