From 48f5220bc5eb826402f43e440dc34867368ff17c Mon Sep 17 00:00:00 2001 From: hongjli <3117313295@qq.com> Date: 星期五, 23 五月 2025 13:41:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java index 001a28a..a51836c 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java +++ b/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(); -- Gitblit v1.9.3