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 |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 9446416..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,7 +28,9 @@
 
     @TableId(value = "id",type = IdType.AUTO)
     private Integer id;
-
+    @TableField("terminal_code")
+    @ApiModelProperty("终端编号")
+    private String terminalCode;
     @ApiModelProperty("服务城市")
     @TableField("city")
     private String city;
@@ -92,5 +94,13 @@
     @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