Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

昨天 53526a6c99085577969aec2cdd0a13fe35394e0b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java

@@ -53,7 +53,7 @@
    }

    public static String getTargetLoc(Long areaId, Long containerType) {
        Long locType = null;
        Long locType = containerType;
//        if (!Objects.isNull(containerType)) {
//            LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
//            if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {