Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 zhang-content/src/main/java/com/ruoyi/domain/ZfAncestor.java

@@ -55,4 +55,9 @@
     */
    private Integer spouseId;

    /**
     *密码
     */
    private String password;

}