Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java

@@ -89,11 +89,11 @@

    /**
     *
     * @param ex 数据库异常
     * @param ex 服务层业务异常
     * @return
     */
    @ExceptionHandler(value = ServiceException.class)
    public R serviceException(Exception ex) {
    public R serviceException(ServiceException ex) {
        log.error("服务层业务异常【{}】",ex.getMessage());
        return R.fail(ex.getMessage());
    }