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,