From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java |    9 +--------
 1 files changed, 1 insertions(+), 8 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 5800467..b97c928 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
@@ -35,12 +35,6 @@
     private Long id;
 
     /**
-     * 鏍囪瘑
-     */
-    @ApiModelProperty(value= "鏍囪瘑")
-    private String uuid;
-
-    /**
      * 鍚嶇О
      */
     @ApiModelProperty(value= "鍚嶇О")
@@ -111,8 +105,7 @@
 
     public MatnrGroup() {}
 
-    public MatnrGroup(String uuid,String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.uuid = uuid;
+    public MatnrGroup(String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.name = name;
         this.code = code;
         this.parentId = parentId;

--
Gitblit v1.9.1