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

skyouc

2025-03-31 c5e5befb594587bd0c5144695ec59503333a6b9b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java

@@ -117,17 +117,6 @@
                }
            }
        }
//        IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper);
//        /**获取物料分页信息 */
//        List<Map<String, Object>> mapList = reulst.getRecords();
//        if (!mapList.isEmpty()) {
//            mapList.forEach(map -> {
//                if (!Objects.isNull(map.get("fieldsIndex"))) {
//                   FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
//                }
//            });
//        }

        /**拼接扩展字段*/
        PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
        List<Matnr> records = page.getRecords();