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

liyong

3 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

 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;

        }