From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
index b2a68e6..58f0813 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
@@ -33,10 +33,6 @@
@TableField("city")
private String city;
- @ApiModelProperty("服务城市id")
- @TableField("city_id")
- private Integer cityId;
-
@ApiModelProperty("用户编号(用户昵称/用户id)")
@TableField("user_number")
private String userNumber;
@@ -89,4 +85,20 @@
@TableField("is_enable")
private Integer isEnable;
+ @ApiModelProperty("管辖城市二维数组")
+ @TableField("city_str")
+ private String cityStr;
+
+ @ApiModelProperty("对应城市code")
+ @TableField("city_code")
+ private String cityCode;
+ @ApiModelProperty("纬度")
+ @TableField("worker_lat")
+ private String workerLat;
+ @ApiModelProperty("经度")
+ @TableField("worker_lon")
+ private String workerLon;
+ @TableField(exist = false)
+ private String lacation;
+
}
--
Gitblit v1.7.1