From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 06 十二月 2023 20:18:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1 --- src/main/java/com/zy/asrs/controller/NodeController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java index 893a6d3..ab6619a 100644 --- a/src/main/java/com/zy/asrs/controller/NodeController.java +++ b/src/main/java/com/zy/asrs/controller/NodeController.java @@ -76,7 +76,7 @@ @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ EntityWrapper<Node> wrapper = new EntityWrapper<>(); - //wrapper.ne("type",3); + wrapper.ne("type",3); excludeTrash(param); convert(param, wrapper); hostEq(wrapper); -- Gitblit v1.9.1