Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

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

@@ -23,7 +23,7 @@
    @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());