Revert "新增字段"

zqy

21 小时以前 411dd00a318469a0ffe7761232a955c929bf2eca

Revert "新增字段"

This reverts commit 66d6b28dc2884fd5af08eee446ef487affba9220.

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -129,8 +129,6 @@
        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
        if(zInfoUser!=null)
        {
            zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());

            return AjaxResult.success(zInfoUser);
        }
        else
@@ -144,10 +142,7 @@

        //查询sys_user表
        //  SysUser sysUser = sysUserService.selectUserById(userId);
        ZInfoUser infoById = zInfoUserService.getInfoById(userId);
        if (infoById != null) infoById.setUpdateTime(infoById.getUpdateTime()==null?infoById.getCreateTime():infoById.getUpdateTime());

        return AjaxResult.success(infoById);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//

@@ -198,8 +193,6 @@
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
        user.setEmail(zInfoUser.getEmail());
        user.setUpdateTime(zInfoUser.getUpdateTime()!=null?zInfoUser.getUpdateTime():currentDate);

        String oriUaid = zInfoUser.getUaid();

        String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
@@ -494,4 +487,4 @@
        return zInfoUserService.findUserNameAClan(strings1);
    }

}
}

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

@@ -253,10 +253,4 @@
     */
    @TableField(exist = false)
    private List<ZInfoUser> childList;

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