From dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 23 十二月 2024 15:45:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

---
 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