Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/elk/ElkController.java

@@ -156,7 +156,7 @@ public class ElkController {
         if (Blank.notBlank(domain)) {
             BoolQueryBuilder boolQueryBuilder2 = new BoolQueryBuilder();
             List<QueryBuilder> should = boolQueryBuilder2.should();
-            should.add(QueryBuilders.matchQuery(domainType, subject));
+            should.add(QueryBuilders.matchQuery(domainType, domain));
             list.add(boolQueryBuilder2);
         }
         if (Blank.notBlank(year)) {

nngkxxdp/src/main/resources/static/constans.js

@@ -86,4 +86,4 @@ function tologin(){
 
         }
     });
-}
+}

nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -63,4 +63,4 @@
     }
 </script>
 
-</html>
+</html>