Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

 screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java

@@ -65,6 +65,7 @@

        QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
        sysAreaQueryWrapper.select("area_code", "area_name", "parent_code").in("area_code", cityCodes);
        //获取当前用户拥有权限的地图列表
        List<SysArea> allAreas = sysAreaMapper.selectList(sysAreaQueryWrapper);

        //第一级城市