From ecdb03d39b50e0a9b8e47b836039609a9bd2aed5 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Thu, 22 Jan 2026 16:00:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8822=E6=97=A5=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/Admin.java | 1 + src/main/resources/mapper/AdminMapper.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/example/demo/domain/entity/Admin.java b/src/main/java/com/example/demo/domain/entity/Admin.java index 495193e..3630b1b 100644 --- a/src/main/java/com/example/demo/domain/entity/Admin.java +++ b/src/main/java/com/example/demo/domain/entity/Admin.java @@ -27,6 +27,7 @@ public class Admin implements UserDetails, Serializable { private Byte adminStatus; // 状态（启用/不启用） private List market; // 地区列表 private String markets; // 地区 + private String marketName; // 地区名称 private String roleKey; private String postiton; // 职位 private String remark; // 备注 diff --git a/src/main/resources/mapper/AdminMapper.xml b/src/main/resources/mapper/AdminMapper.xml index a245806..f070dd4 100644 --- a/src/main/resources/mapper/AdminMapper.xml +++ b/src/main/resources/mapper/AdminMapper.xml @@ -11,6 +11,7 @@ machine_id as machineId, admin_status as adminStatus, market as markets, + market as marketName, postiton as postiton, remark as remark, create_time as createTime, @@ -27,6 +28,7 @@ machine_id as machineId, admin_status as adminStatus, market as markets, + market as marketName, postiton as postiton, remark as remark, create_time as createTime,