Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2024-12-20 78ff74dfc9c42ee12993ac01c43063d0432231e3

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