Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2 天以前 e19b7b5d6b4a7658a7e172527017052a68b49f4d

 src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

@@ -357,7 +357,7 @@
     */

    public static boolean isMatchedIp(String filter, String ip)

    {

        if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))

        if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))

        {

            return false;

        }