Merge branch 'dev_v1.3.4_20220902'

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -54,7 +54,7 @@
         </choose>
         left join sys_user su on su.id_ = t.user_id_
         <where>
-            t.lock_flag_ = 0
+            t.lock_flag_ = 0 and su.del_flag_ = 0
             <if test="keyword != null and keyword != ''">
                 and (
                 su.real_name_ like concat('%',#{keyword},'%')