Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-18 8d318c222ede0dcc587ac1177c2e4900e609151e

 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>