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'
---
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
index d4a5af9..0b45e74 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
@@ -4,11 +4,17 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Data
@JsonSerialize
//鏂板浜у搧淇℃伅鍙傛暟
public class SaleMaterialDto {
+
+ //浜у搧id
+ @NotNull(message = "浜у搧id涓嶈兘涓虹┖")
+ @JsonSerialize
+ private Integer id;
//浜у搧鍚嶇О
@NotBlank(message = "浜у搧鍚嶇О涓嶈兘涓虹┖")
@@ -26,7 +32,7 @@
private String unit;
//鏁伴噺
- @NotBlank(message = "鏁伴噺涓嶈兘涓虹┖")
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
@JsonSerialize
private Integer number;
@@ -34,4 +40,19 @@
@NotBlank(message = "鍗曚环涓嶈兘涓虹┖")
@JsonSerialize
private String price;
+
+ //鏀惰揣鍦板潃
+ @NotBlank(message = "鏀惰揣鍦板潃涓嶈兘涓虹┖")
+ @JsonSerialize
+ private String adress;
+
+ //鑱旂郴浜�
+ @NotBlank(message = "鑱旂郴浜轰笉鑳戒负绌�")
+ @JsonSerialize
+ private String username;
+
+ //鑱旂郴鐢佃瘽
+ @NotBlank(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖")
+ @JsonSerialize
+ private String phone;
}
--
Gitblit v1.9.3