Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java

@@ -110,6 +110,9 @@
    public ResultVO errorHandler(Exception e) {
        e.printStackTrace();
        logger.error(e.getMessage());
        return new ResultVO(ResultCodes.SERVER_ERROR);
        ResultVO resultVO = new ResultVO<>();
        resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
        return resultVO;
//        return new ResultVO(ResultCodes.SERVER_ERROR);
    }
}