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/SaleDto.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
index a32085e..c309f10 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
@@ -6,6 +6,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -35,20 +36,9 @@
@JsonSerialize
private String proname;
- //鏀惰揣鍦板潃
- @NotBlank(message = "鏀惰揣鍦板潃涓嶈兘涓虹┖")
+ //澶囨敞
@JsonSerialize
- private String adress;
-
- //鑱旂郴浜�
- @NotBlank(message = "鑱旂郴浜轰笉鑳戒负绌�")
- @JsonSerialize
- private String username;
-
- //鑱旂郴鐢佃瘽
- @NotBlank(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖")
- @JsonSerialize
- private String phone;
+ private String note;
//涓嬪崟浜�
@JsonSerialize
@@ -56,12 +46,11 @@
private String orderName;
//浜よ揣鏃ユ湡
- @NotBlank(message = "浜よ揣鏃ユ湡涓嶈兘涓虹┖")
+ @NotNull(message = "浜よ揣鏃ユ湡涓嶈兘涓虹┖")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date delTime;
//浜у搧淇℃伅
- @NotBlank(message = "浜у搧淇℃伅涓嶈兘涓虹┖")
@JsonSerialize
private List<SaleMaterialDto> saleMaterialList;
}
--
Gitblit v1.9.3