From c6d6e2f5207677f7bf4a9d4f7d29185e057e6da7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 10 Mar 2021 09:52:54 +0800
Subject: [PATCH] 上传
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 456f00d..05d50dc 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -61,7 +61,7 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
- parent_id,district,province,city,
+ parent_id,district,province,city,serialNumber,channelNumber,
jd ,
wd ,
street,
@@ -187,9 +187,9 @@
parameterType="org.springblade.jfpt.equipment.entity.Equipment">
SELECT
dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
- dept.ownerId,dept.devicestate,dept.stime,
+ dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
- dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,
+ dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
--
Gitblit v1.9.3