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

houruijun

2020-08-13 d526d571cbe0a950e777fb325978d72f3ddb302b

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/search/index_manager_view.html

@@ -26,7 +26,7 @@
                if (0 == data.code) {
                    $('#data').html(syntaxHighlight(data.datas));
                } else {
                    layer.msg('获取索引信息失败', {icon: 2, time: 500});
                    layer.msg('获取索引信息失败', {icon: 2, time: 2000});
                }
            }, 'GET');
        }