Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-21 e3bd647305c6f4e1c8c901741932deda10a8db34

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java

@@ -60,6 +60,7 @@
    @TableField(exist = false)
    private String key;

    @JsonIgnore
    public String getKey() {
        if (key == null) {
            key = getFactory() + "##" + getMaterialCode();