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

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

@@ -114,7 +114,7 @@
 
     <select id="search" parameterType="hashmap" resultMap="PersonDeviceLogMap">
         <![CDATA[
-			select a.*,b.del_flag as person_flag  from base_person_device_log a left join base_device_info b
+			select a.*,c.del_flag as person_flag  from base_person_device_log a left join base_device_info b
 			on  a.device_no = b.device_no left join base_person_info c
 			on a.person_id = c.id_
 		]]>