Merge remote-tracking branch 'origin/test-xq2' into test

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -2209,7 +2209,7 @@
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
         AND sd.del_flag = '0'
         WHERE
-         su.status in(6,2)  and su.type = 4 and t3.role_id = 97
+         su.status in(6,2)  and su.type = 4 and t3.role_id = 108
         <if test='user !=null  '>
             <if test='user.name !=null and user.name!="" '>
                 and su.name like concat('%',#{user.name},'%')