Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-13 1bca1b9c61676b48cc3137d3003e520c75ecdd92

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -644,7 +644,7 @@
    @Override
    public List<SysUser> userByDept(Long deptId) {
        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("dept_id",deptId).eq("delFlag","0").eq("appUserType","1");
        queryWrapper.eq("dept_id",deptId).eq("del_flag","0").eq("app_user_type","1");
        return userMapper.selectList(queryWrapper);
    }
}