From 3e5134249dc75acdabfc467d8c03f321992cdf07 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 十月 2025 18:11:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 959e171..d8e3936 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
@@ -10,6 +10,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.List;
+
/**
* <p>
* 人员管理
@@ -65,12 +67,35 @@
@TableField("other_count")
private Integer otherCount;
-
- @ApiModelProperty(value = "状态 0待审核 1通过 2拒绝")
+ @ApiModelProperty(value = "审核状态 0=待审核 1=通过 2=拒绝")
+ @TableField("state")
private Integer state;
- @ApiModelProperty(value = "职业技能")
- private String level;
+ @ApiModelProperty(value = "职业技能 1=无 2=初级 3=中级 4=高级")
+ @TableField("level")
+ private Integer level;
+ @ApiModelProperty(value = "执行任务状态 1=空闲 2=任务中")
+ @TableField("mission_state")
+ private Integer missionState;
+
+ @ApiModelProperty(value = "经度")
+ @TableField(exist = false)
+ private String lon;
+ @ApiModelProperty(value = "纬度")
+ @TableField(exist = false)
+ private String lat;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "用户专业")
+ private List<TUserMajor> userMajors;
+
+ @ApiModelProperty(value = "距离 km")
+ @TableField(exist = false)
+ private Double userDistance;
+
+ @ApiModelProperty(value = "评分")
+ @TableField(exist = false)
+ private Double scoreTotal;
}
--
Gitblit v1.7.1