From 93b0023ac8d9c86191a87805b597ec3ffa3da2c5 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 20 Jun 2024 10:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E9=99=A4=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../securitycontrol/entity/background/vo/DeviceBdChildVo.java   | 1 -
 .../src/main/resources/mapper/DeviceBdMapper.xml                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
index e458426..af955c1 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
@@ -51,7 +51,6 @@ public class DeviceBdChildVo {
     private String updateTime;
 
     @ApiModelProperty(value = "设备信号")
-    @NotBlank(message = "设备信号不能为空", groups = {Query.class})
     @Length(max = 50, message = "设备信号字符长度不能超过50", groups = {Query.class})
     private String deviceModel;
 
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index c164107..a6c129b 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -53,7 +53,7 @@
                 <if test="createTime != null and createTime!=''">create_time,</if>
                 <if test="updateTime != null and updateTime!=''">update_time,</if>
                 del_flag,
-                <if test="updateTime != null and updateTime!=''">device_model,</if>
+                <if test="deviceModel != null and deviceModel!=''">device_model,</if>
                 <if test="bdId != null and bdId!=''">bd_id,</if>
                 <if test="areaId != null and areaId!=''">area_id,</if>
                 <if test="gtId != null and gtId!=''">gt_id,</if>