Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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