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

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

@@ -60,7 +60,7 @@
 			on a.person_id = c.id_
 		]]>
         <where>
-            and a.del_flag = false and b.del_flag=false and c.del_flag=false
+            and a.del_flag = false and b.del_flag=false
             <if test="searchParams.companyId != null">
                 and c.company_id = #{searchParams.companyId}
             </if>