Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -177,14 +177,13 @@
    /**
     * 父亲的id
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)

//    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Long fatherId;

    /**
     * 母亲的id
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
//    @TableField(updateStrategy = FieldStrategy.IGNORED)

    private Long momId;