Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

17 小时以前 e0c8edd1d949fae5883a60019d02a9c5f7cb7a29

 src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -38,7 +38,7 @@
            final Object... args)

    {

        final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));

        final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());

        final String ip = IpUtils.getIpAddr();

        return new TimerTask()

        {

            @Override