From 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 10:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java | 9 ++++++++-
1 files changed, 8 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 1d0c087..cccf9bc 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;
@@ -29,6 +29,9 @@
@ApiModelProperty("灏哄")
private String size;
+
+ @ApiModelProperty("瑙勬牸")
+ private String spec;
@ApiModelProperty("鎻忚堪")
private String describle;
@@ -48,5 +51,9 @@
@ApiModelProperty("鏉″舰鐮�")
private String barcode;
+ @ApiModelProperty("鎿嶄綔绫诲瀷锛�0鏂板/鏇存柊/瑙ｇ(鍚敤)锛�1绂佺敤")
+ private Integer operateType;
+
}
+
--
Gitblit v1.9.1