From 3f2b778ab3fbee3d851ed7033451cc008366ab4b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 13:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
index cd13bb9..ee9e813 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java
@@ -16,7 +16,7 @@
     private String matnr;
 
     @ApiModelProperty("鐗╂枡鍒嗙粍")
-    private Long groupName;
+    private String groupName;
 
     @ApiModelProperty("鍨嬪彿")
     private String model;

--
Gitblit v1.9.1