Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

 igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java

@@ -562,8 +562,9 @@
        log.debug("----------------根据用户IP获取选择-地磅----{}", userIp);

        String key = "INOUT:WEIGHT:" + userIp;

        return (String) redisUtil.get(key);
        String sort =  (String)redisUtil.get(key);
        if(StringUtils.isEmpty(sort))sort="1";
        return sort;
    }

    /**