Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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

@@ -45,6 +45,11 @@
        return zfPropertyService.selectDataList(zfProperty, pageNum, pageSize);
    }

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

    /**
     * 获取导入模板
     */