Merge remote-tracking branch 'origin/6170' into 6170

This commit is contained in:
2025-10-13 16:15:26 +08:00
4 changed files with 50 additions and 19 deletions

View File

@ -311,7 +311,7 @@
AND a.device_name like concat('%',#{bo.deviceName},'%')
</if>
<if test="bo.deviceMac != null and bo.deviceMac != ''">
AND a.device_mac = #{bo.deviceMac}
AND a.device_mac like concat('%',#{bo.deviceMac},'%')
</if>
<if test="bo.deviceImei != null and bo.deviceImei != ''">
and a.device_imei like concat('%',#{bo.deviceImei}, '%')