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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

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

@@ -25,6 +25,7 @@
    public ResultMessage handleException(Exception ex) {
        log.error(ex.getMessage());
        ex.printStackTrace();

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