Merge remote-tracking branch 'origin/dev' into dev

hongjli

2025-05-23 48f5220bc5eb826402f43e440dc34867368ff17c

 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();