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

skyouc

2025-04-11 43e98544b21f452b8dfa94834dc4b8906bd2dec4

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java

@@ -360,7 +360,7 @@
        MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
        MatnrGroup matnrGroup = service.getById(this.groupId);
        if (!Cools.isEmpty(matnrGroup)){
            return String.valueOf(matnrGroup.getCode());
            return String.valueOf(matnrGroup.getName());
        }
        return null;
    }