From b69b63a09089566b0b2505fbc39a673c3e18785f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 11:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index 30f8dad..ee49c83 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -41,9 +41,15 @@
     private String name;
 
     /**
+     * 鍒嗙粍缂栫爜
+     */
+    @ApiModelProperty("涓婄骇鍒嗙粍缂栫爜")
+    private String parCode;
+
+    /**
      * 鐗╂枡缂栫爜
      */
-    @ApiModelProperty(value= "鐗╂枡缂栫爜")
+    @ApiModelProperty(value= "鍒嗙粍缂栫爜")
     private String code;
 
     /**

--
Gitblit v1.9.1