Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

 screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java

@@ -23,8 +23,9 @@
    @ResponseBody
    @ResponseStatus(HttpStatus.OK)
    public ResultMessage handleException(Exception ex) {
        log.error(ex.getMessage());
       // log.error(ex.getMessage());
        ex.printStackTrace();

        return  ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
    }