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

feige

4 天以前 ba97f97d28f65d2b8ed5406792aa66a9d3fc9ed8

 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;

@@ -231,6 +230,10 @@
     */
    private String secondFamilyId;

    /**
     * 判断唯一的用户编码
     */
    private String uaid;

    private Long sysId;
    /**
@@ -251,7 +254,10 @@
    @TableField(exist = false)
    private List<ZInfoUser> childList;



    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
    private Date updateTime;

}