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