From 8d2467a5c6647853df999261e1f5374f6a66da02 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 19 八月 2023 14:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index 90c8603..4e17b31 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -13,7 +13,7 @@
<result property="username" column="username"/>
<result property="password" column="password"/>
<result property="gdtype" column="gdtype"/>
- <result property="channel" column="channel"/>
+ <result property="chanNum" column="channel"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
<result property="altitude" column="altitude"/>
@@ -78,7 +78,7 @@
<if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
<if test="password != null and password != ''">and c.password = #{password}</if>
<if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
- <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="chanNum != null ">and c.channel = #{chanNum}</if>
<if test="longitude != null ">and c.longitude = #{longitude}</if>
<if test="latitude != null ">and c.latitude = #{latitude}</if>
<if test="altitude != null ">and c.altitude = #{altitude}</if>
@@ -111,7 +111,7 @@
<if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
<if test="password != null and password != ''">and c.password = #{password}</if>
<if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
- <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="chanNum != null ">and c.channel = #{chanNum}</if>
<if test="longitude != null ">and c.longitude = #{longitude}</if>
<if test="latitude != null ">and c.latitude = #{latitude}</if>
<if test="altitude != null ">and c.altitude = #{altitude}</if>
@@ -148,7 +148,7 @@
<if test="username != null">username,</if>
<if test="password != null">password,</if>
<if test="gdtype != null">gdtype,</if>
- <if test="channel != null">channel,</if>
+ <if test="chanNum != null">channel,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="altitude != null">altitude,</if>
@@ -179,7 +179,7 @@
<if test="username != null">#{username},</if>
<if test="password != null">#{password},</if>
<if test="gdtype != null">#{gdtype},</if>
- <if test="channel != null">#{channel},</if>
+ <if test="chanNum != null">#{chanNum},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="altitude != null">#{altitude},</if>
@@ -213,7 +213,7 @@
<if test="username != null">username = #{username},</if>
<if test="password != null">password = #{password},</if>
<if test="gdtype != null">gdtype = #{gdtype},</if>
- <if test="channel != null">channel = #{channel},</if>
+ <if test="chanNum != null">channel = #{chanNum},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="altitude != null">altitude = #{altitude},</if>
--
Gitblit v1.9.3