From 851aa3d5d8bc4920a86ea683198f736a043213b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 十月 2025 10:21:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 0730c03..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
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -75,6 +76,10 @@
@TableField("level")
private Integer level;
+ @ApiModelProperty(value = "执行任务状态 1=空闲 2=任务中")
+ @TableField("mission_state")
+ private Integer missionState;
+
@ApiModelProperty(value = "经度")
@TableField(exist = false)
private String lon;
@@ -82,8 +87,16 @@
@TableField(exist = false)
private String lat;
-
@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