Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue

RuoYi

2020-07-04 31765f63926c31d6a7322df5d19e30c04ba2839e

 ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -40,7 +40,7 @@
         AND status = #{status}

      </if>

      <!-- 数据范围过滤 -->

      ${dataScope}

      ${params.dataScope}

      order by d.parent_id, d.order_num

    </select>