Merge remote-tracking branch 'origin/master'

web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml

@@ -35,7 +35,7 @@
                            ON g.mkmj_id = m.id
                                AND m.delete_enum = 'FALSE'
                  LEFT JOIN `user` u
-                           ON u.user_id_card = BINARY TO_BASE64(TRIM(r.person_code))
+                           ON u.user_id_card = TO_BASE64(TRIM(r.person_code))
                                AND u.delete_enum = 'FALSE'
         WHERE r.delete_enum = 'FALSE'
         <if test="params.userId != null">