Merge branch 'dev' of chenweida/jkzl-starter into dev

.gitignore

@@ -8,7 +8,6 @@
*.pyc
*.pyo
.idea/
*.log
.idea_modules/
build/*.jar
.settings

admin/admin-server-ui-starter/src/main/resources/admin/log/js/distributedLog.js

@@ -7,7 +7,7 @@ var contentVM = new Vue({
});
var page = 0
var pageSize = 10
search();
searchDistributedLog();
function searchDistributedLog() {
    do_get(