Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml

@@ -15,8 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                su.login_type     as loginType
         from sys_user su
                  left join account_card ac on ac.user_id = su.user_id
-                 left join account_info ai on ai.user_id = su.user_id and ai.del_flag = '0'
-        where su.status = '0'
+                 left join account_info ai on ai.user_id = su.user_id
+        where su.status = '0'  and ai.del_flag = '0'
         <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
             AND su.user_id = #{userId}
         </if>