Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java

@@ -23,7 +23,7 @@

    AjaxResult deleteData(Integer clanId, Integer id);

    ZfAncestor update(ZfAncestor zfAncestor);
    AjaxResult update(ZfAncestor zfAncestor);

    ZfAncestor selectZfAncestor(ZfAncestor zfAncestor);