Merge remote-tracking branch 'origin/master'

feige

2025-05-06 c24698dacd5d43d99bbae35b430a189675a6532b

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