Merge branch 'zyj-keyword' into 'master'

修改时间

See merge request rays/pcloud-book!221

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -725,7 +725,7 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         List<ReplyKeywordDTO> ImgKeyword = keywordDTOS.stream()
                 .filter(p -> (ReplyTypeEnum.IMAGE.value.equals(p.getReplyType()) || ReplyTypeEnum.TEXT.value.equals(p.getReplyType()))).collect(Collectors.toList());
         //不包含图片和文字且18点到9点 则合并关键词详情，其他情况走之前的模式
-        if (CollectionUtils.isEmpty(ImgKeyword) && !DateUtils.isInBetweenTimes("13:00:00", "18:00:00")) {
+        if (CollectionUtils.isEmpty(ImgKeyword) && !DateUtils.isInBetweenTimes("9:00:00", "18:00:00")) {
             sendKeyWordAtPeak(collect, keywordDTOS, classifyQrcodeInfo, sendTextDTO);
         } else {
             // 组装发送关键词