合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/java/com/zy/common/config/AspectConfig.java

@@ -49,9 +49,9 @@
            "||@within(org.springframework.stereotype.Controller)")
    public Object after(ProceedingJoinPoint joinPoint) throws Throwable{
        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
        if(requestAttributes != null){
            return joinPoint.proceed();
        }
        //if(requestAttributes != null){
        //    return joinPoint.proceed();
        //}
        HttpServletRequest request = requestAttributes.getRequest();
        long start = System.currentTimeMillis();
        Object result = joinPoint.proceed(joinPoint.getArgs());