From 85973ffba77aeff71f2dbd588c7fb81f89148fdc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 18 二月 2025 08:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 4d61ab1..14b9743 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -36,11 +36,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String uuid;
/**
* 璐т富ID
@@ -106,7 +101,7 @@
* 鎻忚堪
*/
@ApiModelProperty(value= "鎻忚堪")
- private String desc;
+ private String describle;
/**
* 鏍囧寘鏁伴噺
@@ -197,8 +192,7 @@
public Matnr() {}
- public Matnr(String uuid,Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String desc,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
+ public Matnr(Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.shipperId = shipperId;
this.name = name;
this.code = code;
@@ -209,7 +203,7 @@
this.weight = weight;
this.color = color;
this.size = size;
- this.desc = desc;
+ this.describle = describle;
this.nromNum = nromNum;
this.unit = unit;
this.purchaseUnit = purchaseUnit;
--
Gitblit v1.9.1