From e4501c9e28eee2e620f70af5e6a966c432fa4068 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 15 Jan 2021 11:01:47 +0800
Subject: [PATCH] 1.jar包名字
---
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
index 1c7b361..7c2f1a2 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -59,7 +59,7 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
- coordinate,dtype,
+ coordinate,dtype,heartbeat,expireTime,pay,
parent_id,
FORMAT( jd, 6 ) AS jd,
FORMAT( wd, 6 ) AS wd,
@@ -79,7 +79,6 @@
<if test="dtype!=null">
and dtype=#{dtype}
</if>
- and parent_id!=0
</select>
<!--新增-->
@@ -156,7 +155,7 @@
SELECT
dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
dept.ownerId,dept.devicestate,dept.stime,
- ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,
+ ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
dept.parent_id,dept.jd,dept.wd,dept.street as streeName,u.yname,d.addvnm,dept.addvcd,
(
SELECT
--
Gitblit v1.9.3