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

buhuazhen

5 小时以前 5de00e436cb41dee07b75c20391db7bc0a5b3660

 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;

        }