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-worker/src/main/java/com/ruoyi/worker/entity/MasterWorker.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/MasterWorker.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/MasterWorker.java
index a0346ff..4170b3b 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/MasterWorker.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/MasterWorker.java
@@ -10,8 +10,6 @@
import lombok.Getter;
import lombok.Setter;
-import java.util.Date;
-
/**
* <p>
* 师傅信息表
@@ -33,10 +31,6 @@
@TableField("city")
private String city;
- @ApiModelProperty("服务城市id")
- @TableField("city_id")
- private Integer cityId;
-
@ApiModelProperty("用户编号(用户昵称/用户id)")
@TableField("user_number")
private String userNumber;
@@ -55,7 +49,7 @@
@ApiModelProperty("生日")
@TableField("birthday")
- private Date birthday;
+ private String birthday;
@ApiModelProperty("身份证号码")
@TableField("id_number")
@@ -88,5 +82,10 @@
@ApiModelProperty("是否启用 0未启用;1已启用")
@TableField("is_enable")
private Integer isEnable;
-
+ @ApiModelProperty("经度")
+ @TableField("worker_lon")
+ private String workerLon;
+ @ApiModelProperty("纬度")
+ @TableField("worker_lat")
+ private String workerLat;
}
--
Gitblit v1.7.1