Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

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