Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

 src/main/java/com/zy/common/config/AdminInterceptor.java

@@ -144,7 +144,7 @@
    /**
     * 跨域
     */
    private void cors(HttpServletResponse response){
    public static void cors(HttpServletResponse response){
        // 跨域设置
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Credentials", "true");