Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2024-09-10 01a9d85aef5ed445acdc7f68798fa19efd480e2e

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

@@ -45,14 +45,19 @@
     */
    private Integer status;

    /**
     * 是否本家
     */
    private Integer isMyFamily;

//    /**
//     * 是否本家
//     */
//    private Integer isMyFamily;
//
    /**
     *配偶id
     */
    private Integer spouseId;

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

}