From a65bf7aaf9f24305b63a78ae4d7b4a14f2818fe4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:25:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 76eecee..0730c03 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>
  * 人员管理
@@ -69,8 +71,19 @@
     @TableField("state")
     private Integer state;
 
-    @ApiModelProperty(value = "职业技能")
-    private String level;
+    @ApiModelProperty(value = "职业技能 1=无 2=初级 3=中级 4=高级")
+    @TableField("level")
+    private Integer level;
+
+    @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;
 }

--
Gitblit v1.7.1