From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomModelDto.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomModelDto.java b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomModelDto.java
index 759b24b..9a6e761 100644
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomModelDto.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomModelDto.java
@@ -6,6 +6,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.List;
@Data
//鏂板璁板綍鍐呭缁存姢鍙傛暟
@@ -15,23 +16,7 @@
@NotNull(message = "宸ヨ壓璺嚎id涓嶈兘涓虹┖")
private Integer techTemId;
- @JsonSerialize
- @NotBlank(message = "鍘熸潗鏂欏悕绉颁笉鑳戒负绌�")
- private String name;
+ //鍘熸潗鏂欐竻鍗曢泦鍚�
+ private List<MbomModelDto2> mbomModelDto2List;
- @JsonSerialize
- @NotBlank(message = "鍗曚綅涓嶈兘涓虹┖")
- private String unit;
-
- @JsonSerialize
- @NotBlank(message = "渚涘簲鍟嗕笉鑳戒负绌�")
- private String supplier;
-
- @JsonSerialize
- @NotBlank(message = "璐ㄩ噺杩芥函鍙蜂笉鑳戒负绌�")
- private String qualityTraceability;
-
- @JsonSerialize
- @NotBlank(message = "瑙勬牸鍨嬪彿涓嶈兘涓虹┖")
- private String specifications;
}
--
Gitblit v1.9.3