Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

8 天以前 408bab8b1c0c10514b8395cff92e47751e4dcdcd

 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;

        }