From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index c8fa4e0..3a13832 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -13,6 +13,7 @@
<result property="username" column="username"/>
<result property="password" column="password"/>
<result property="gdtype" column="gdtype"/>
+ <result property="factory" column="factory"/>
<result property="chanNum" column="channel"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
@@ -44,6 +45,7 @@
c.username,
c.password,
c.gdtype,
+ c.factory,
c.channel,
c.longitude,
c.latitude,
@@ -80,6 +82,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="factory != null and factory != ''">and c.factory = #{factory}</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>
@@ -113,6 +116,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="factory != null and factory != ''">and c.factory = #{factory}</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>
@@ -150,6 +154,7 @@
<if test="username != null">username,</if>
<if test="password != null">password,</if>
<if test="gdtype != null">gdtype,</if>
+ <if test="factory != null">factory,</if>
<if test="chanNum != null">channel,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
@@ -181,6 +186,7 @@
<if test="username != null">#{username},</if>
<if test="password != null">#{password},</if>
<if test="gdtype != null">#{gdtype},</if>
+ <if test="factory != null">#{factory},</if>
<if test="chanNum != null">#{chanNum},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
@@ -215,6 +221,7 @@
<if test="username != null">username = #{username},</if>
<if test="password != null">password = #{password},</if>
<if test="gdtype != null">gdtype = #{gdtype},</if>
+ <if test="factory != null">factory = #{factory},</if>
<if test="chanNum != null">channel = #{chanNum},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
--
Gitblit v1.9.3