From dcfb4bbb42ec139daa990797a4f17fb99db44f9c Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期三, 01 十一月 2023 17:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.245.94:8000/r/RR_IOTWater_JAVA
---
wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml b/wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
index b1667e2..e87330a 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -53,6 +53,7 @@
<result property="thingsModelValue" column="things_model_value" />
<result property="imgUrl" column="img_url" />
<result property="isOwner" column="is_owner" />
+ <result property="assignTime" column="assign_time" />
</resultMap>
<resultMap type="com.ruoyi.iot.model.DeviceAllShortOutput" id="DeviceAllShortResult">
@@ -199,7 +200,7 @@
select d.device_id, d.device_name, d.product_id, d.product_name,
d.user_id, d.user_name, d.tenant_id, su.nick_name tenant_name, d.serial_number,
d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way,
- d.things_model_value, d.active_time,d.img_url,max(u.is_owner) as is_owner
+ d.things_model_value,d.assign_time, d.active_time,d.img_url,max(u.is_owner) as is_owner
from iot_device d
inner join iot_device_user u on u.device_id = d.device_id
inner join sys_user su on su.user_id = d.tenant_id
@@ -440,6 +441,7 @@
<if test="remark != null">remark = #{remark},</if>
<if test="imgUrl != null">img_url = #{imgUrl},</if>
<if test="summary != null">summary = #{summary},</if>
+ <if test="assignTime != null">assign_time = #{assignTime},</if>
</trim>
where serial_number = #{serialNumber}
</update>
--
Gitblit v1.8.0