From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..1c3cbd9 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
@@ -28,14 +28,12 @@
@TableId(value = "id",type = IdType.AUTO)
private Integer id;
-
+ @TableField("terminal_code")
+ @ApiModelProperty("终端编号")
+ private String terminalCode;
@ApiModelProperty("服务城市")
@TableField("city")
private String city;
-
- @ApiModelProperty("服务城市id")
- @TableField("city_id")
- private Integer cityId;
@ApiModelProperty("用户编号(用户昵称/用户id)")
@TableField("user_number")
@@ -89,4 +87,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