Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
30caf87d
Commit
30caf87d
authored
Feb 21, 2022
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据id获取设备详情接口添加qrcode返回
parent
060a9a98
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
FireEquipment.java
...oin/equipmanage/common/datasync/entity/FireEquipment.java
+6
-0
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+2
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java
View file @
30caf87d
...
@@ -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
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
30caf87d
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment