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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

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

@@ -145,5 +145,7 @@

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

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

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