From 9b5169ef7fc32b8357222a8990b393e442f77095 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期日, 23 二月 2025 22:57:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java index f4c2004..b566a02 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sangeshenbian/SystemUserVo.java @@ -1,8 +1,5 @@ package com.panzhihua.common.model.vos.sangeshenbian; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,120 +16,100 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "数据ID") private Integer id; /** * 姓名 */ - @TableField("name") @ApiModelProperty(value = "姓名", required = true) private String name; /** * 手机号 */ - @TableField("phone") @ApiModelProperty(value = "手机号", required = true) private String phone; /** * 密码 */ - @TableField("password") @ApiModelProperty(value = "密码", required = true) private String password; /** * 一级单位id */ - @TableField("one_department_id") @ApiModelProperty(value = "一级单位id", required = true) private Integer oneDepartmentId; /** * 二级单位id */ - @TableField("two_department_id") @ApiModelProperty(value = "二级单位id") private Integer twoDepartmentId; /** * 三级单位id */ - @TableField("three_department_id") @ApiModelProperty(value = "三级单位id") private Integer threeDepartmentId; /** * 四级单位id */ - @TableField("four_department_id") @ApiModelProperty(value = "四级单位id") private Integer fourDepartmentId; /** * 是否是管理员(0=否,1=是) */ - @TableField("is_admin") @ApiModelProperty(value = "是否是管理员(0=否,1=是)", required = true) private Integer isAdmin; /** * 职位id */ - @TableField("system_post_id") @ApiModelProperty(value = "职位id", required = true) private Integer systemPostId; /** * 角色id */ - @TableField("system_role_id") @ApiModelProperty(value = "角色id", required = true) private Integer systemRoleId; /** * 账号层级(1=市级账号,2=区县账号,3=街道账号,4=社区账号) */ - @TableField("account_level") @ApiModelProperty(value = "账号层级(1=市级账号,2=区县账号,3=街道账号,4=社区账号)", required = true) private Integer accountLevel; /** * 所属区县 */ - @TableField("districts") @ApiModelProperty(value = "所属区县") private String districts; /** * 区县编号 */ - @TableField("districts_code") @ApiModelProperty(value = "区县编号") private String districtsCode; /** * 街道 */ - @TableField("street") @ApiModelProperty(value = "街道") private String street; /** * 街道编号 */ - @TableField("street_code") @ApiModelProperty(value = "街道编号") private String streetCode; /** * 社区 */ - @TableField("community") @ApiModelProperty(value = "社区") private String community; /** * 社区编号 */ - @TableField("community_code") @ApiModelProperty(value = "社区编号") private String communityCode; /** * 状态(1=正常,2=冻结,3=删除) */ - @TableField("status") private Integer status; /** * 添加时间 */ - @TableField("create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createTime; -- Gitblit v1.7.1