Merge remote-tracking branch 'origin/master'

sgj

昨天 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java

@@ -89,7 +89,7 @@
        if ("1".equals(type)) {
            viewUrl = prefix + "/video-aerial-dept";

            view.put("backgroundImg", commonManager.getDeptImg(deptId));
            view.put("backgroundImg", commonManager.isDeptImgExit(deptId));
        }
        if ("2".equals(type)) {
            viewUrl = prefix + "/video-list-dept";