From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 08 一月 2025 17:17:55 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java | 14 ++++++++++---- 1 files changed, 10 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..ae89ecb 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,14 @@ @TableField("is_enable") private Integer isEnable; + @ApiModelProperty("管辖城市二维数组") + @TableField("city_str") + private String cityStr; + + @ApiModelProperty("对应城市code") + @TableField("city_code") + private String cityCode; + @TableField(exist = false) + private String lacation; + } -- Gitblit v1.7.1