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

zxl

昨天 c4786844ef75025cd27cc3833a0f7cd86ad80781

 buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java

@@ -126,7 +126,7 @@
    public ResultMessage<Page<EsGoodsIndex>> getGoodsByPageFromEs(EsGoodsSearchDTO goodsSearchParams, PageVO pageVO) {
        pageVO.setNotConvert(true);
        Page<EsGoodsIndex> ePage = goodsSearchService.searchGoodsByPage(goodsSearchParams, pageVO);
        ePage.getRecords().forEach(item -> {
        ePage.getRecords().stream().filter(Objects::nonNull).forEach(item -> {
            String small = item.getSmall();
            String thumbnail = item.getThumbnail();
            String goodsVideo = item.getGoodsVideo();