From 31bf3fe30c14ca5d27c470499877a2875cbfc613 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 10:21:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
index dad4b4b..672fa20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
@@ -1,16 +1,17 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -24,11 +25,11 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user")
@ApiModel(value="TAppUser对象", description="人员管理")
-public class TAppUser implements Serializable {
+public class TAppUser extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "姓名")
@@ -55,7 +56,7 @@
@TableField("team_id")
private String teamId;
- @ApiModelProperty(value = "状态 1=启用 0=禁用")
+ @ApiModelProperty(value = "状态 1=启用 2=禁用")
@TableField("status")
private Integer status;
@@ -67,26 +68,35 @@
@TableField("other_count")
private Integer otherCount;
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- private LocalDateTime createTime;
+ @ApiModelProperty(value = "审核状态 0=待审核 1=通过 2=拒绝")
+ @TableField("state")
+ private Integer state;
- @ApiModelProperty(value = "修改时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
+ @ApiModelProperty(value = "职业技能 1=无 2=初级 3=中级 4=高级")
+ @TableField("level")
+ private Integer level;
- @ApiModelProperty(value = "创建人")
- @TableField("create_by")
- private String createBy;
+ @ApiModelProperty(value = "执行任务状态 1=空闲 2=任务中")
+ @TableField("mission_state")
+ private Integer missionState;
- @ApiModelProperty(value = "修改人")
- @TableField("update_by")
- private String updateBy;
+ @ApiModelProperty(value = "经度")
+ @TableField(exist = false)
+ private String lon;
+ @ApiModelProperty(value = "纬度")
+ @TableField(exist = false)
+ private String lat;
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("disabled")
- @TableLogic
- private Integer disabled;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "用户专业")
+ private List<TUserMajor> userMajors;
+ @ApiModelProperty(value = "距离")
+ @TableField(exist = false)
+ private String userDistance;
+
+ @ApiModelProperty(value = "评分")
+ @TableField(exist = false)
+ private BigDecimal userScore;
}
--
Gitblit v1.7.1