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

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -140,4 +140,12 @@
    public List<SysUser> getSysUserByCarId(String carId);

    List<SysUser> userByPlanId(String id);

    List<SysUser> getOnlineCommander(String usersId);

    List<SysUser> getOnlinePC(@Param("usersId") String usersId,@Param("onLinePCIdList")List<String> onLinePCIdList);

    List<SysUser> getOwnAndChildrenOnlineSoilderList(@Param("deptIdList")List<Long> deptIdList);

    List<SysUser> getOwnAndChildrenSoilderListAll(@Param("deptIdList")List<Long> deptIdList);
}