From 78ff74dfc9c42ee12993ac01c43063d0432231e3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' 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