From baf25eef033f7d6596a4fb52dcf612a4d6536a19 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Thu, 8 Aug 2024 16:31:32 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=89=8D=E4=B8=96=E4=BB=8A?= =?UTF-8?q?=E7=94=9F=E5=A2=9E=E5=8A=A0=E5=AE=9E=E5=90=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java | 4 ++++ .../com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java index 688db34..2752144 100644 --- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java @@ -76,4 +76,8 @@ public class EquipmentRecord implements Serializable { @TableField(exist = false) private String nickname; + @ApiModelProperty(value = "用户真实名称") + @TableField(exist = false) + private String realName; + } diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml index 7213717..d37ea66 100644 --- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml @@ -6,7 +6,7 @@ SELECT a.*, b.merchant_name,b.merchant_code, - c.nickname,c.user_id + c.nickname,c.user_id,c.real_name FROM apps_equipment_record a LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code LEFT JOIN sys_user c ON a.user_id = c.user_id