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

liyong

6 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

 src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -38,11 +38,11 @@
    /**

     * 获取部门ID

     **/

    public static Long getDeptId()

    public static Long [] getDeptId()

    {

        try

        {

            return getLoginUser().getDeptId();

            return getLoginUser().getDeptIds();

        }

        catch (Exception e)

        {