Merge remote-tracking branch 'origin/master'

feige

2024-08-28 8429b26635252973e325d020af1a4485a0bbfdb0

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

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

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

}