Commit 30caf87d authored by maoying's avatar maoying

根据id获取设备详情接口添加qrcode返回

parent 060a9a98
...@@ -208,5 +208,10 @@ public class FireEquipment implements Serializable { ...@@ -208,5 +208,10 @@ public class FireEquipment implements Serializable {
@ApiModelProperty(value = "所关联的设备信息") @ApiModelProperty(value = "所关联的设备信息")
@TableField("fireequipmentinfo") @TableField("fireequipmentinfo")
private String fireequipmentinfo; private String fireequipmentinfo;
@ApiModelProperty(value = "二维码")
@TableField(exist = false)
private String qrCode;
} }
\ No newline at end of file
...@@ -757,7 +757,8 @@ ...@@ -757,7 +757,8 @@
NOW( ) AS updatedate, NOW( ) AS updatedate,
es.area_id AS areaid, es.area_id AS areaid,
ws.`name` AS buildname, ws.`name` AS buildname,
a.`name` AS workarea a.`name` AS workarea,
es.qr_code as qrCode
FROM FROM
wl_equipment_specific es wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment