Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 201518a621d0d5f3c2040217950b10a5eaba22e6

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

@@ -181,7 +181,7 @@

    List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);

    List<SysUser> selectUserByDeptId(@Param("id")String id);
    List<SysUser> selectUserByDeptId(@Param("ids")List<String> ids);

    List<TaskFinishListVO> pageListReport(@Param("query")DataReportQuery query, @Param("pageInfo")PageInfo<TaskFinishListVO> pageInfo);