Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java

@@ -49,6 +49,11 @@
        return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
    }

    @GetMapping("/type")
    public AjaxResult listType(){
        return zPropertyService.listType();
    }

    /**
     * 根据id查询
     */