Merge remote-tracking branch 'origin/master'

feige

2024-06-11 8a7e33332203a2e1334ba55a4838b6b1060d406c

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

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