Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

verou

2025-03-25 91e70d462b00475b70edd42e84d3c257bc898b2c

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java

@@ -109,7 +109,7 @@
        if (Objects.isNull(param)) {
            throw new CoolException("参数不能为空！！！");
        }
        if (!StringUtils.isBlank(param.get("locTypeId").toString())) {
        if (!StringUtils.isBlank(param.get("typeId").toString())) {
            throw new CoolException("库位类型不能为空！！");
        }
        if (!StringUtils.isBlank(param.get("areaMatId").toString())) {