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

common/src/main/resources/mapper/base/PersonDeviceRelation.xml

@@ -84,6 +84,7 @@ id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time		fr
 			select * from base_person_device_relation
 		]]>
 		<where>
+			and del_flag = false
 			<if test="searchParams.deviceId != null">
 			and device_id = #{searchParams.deviceId}
 		</if>