Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

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

@@ -35,7 +35,7 @@
    /**
     * 获取部门ID
     **/
    public static Long getDeptId()
    public static String getDeptId()
    {
        try
        {