From a70772c2ba8fdafccaf58ed19200084ea4d0cd60 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Apr 2024 09:15:32 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/vo/Reciever.java  | 6 ++++++
 .../main/java/com/xdadan/erp/emis/domain/vo/Sender.java    | 7 ++++++-
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java   | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
index 992153a4d..05ce0e638 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
@@ -4,18 +4,23 @@ import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
 public class Reciever  implements Serializable {
     private static final long serialVersionUID = 1L;
     /* 国家 */
+    @NotBlank(message = "国家不能为空")
     private String country;
     /* 姓名 */
+    @NotBlank(message = "收件人不能为空")
     private String name;
     /* 电话 */
+    @NotBlank(message = "收件电话不能为空")
     private String phone;
     /* 省 */
+    @NotBlank(message = "收件省份不能为空")
     private String province;
     /* 市 */
     private String city;
@@ -24,6 +29,7 @@ public class Reciever  implements Serializable {
     /* 城镇 */
     private String town;
     /* 地址 */
+    @NotBlank(message = "收件地址不能为空")
     private String address;
     /* 邮编 */
     private String postCode;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
index cd52228e8..5040cfc8f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
@@ -2,19 +2,23 @@ package com.xdadan.erp.emis.domain.vo;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
 public class Sender implements Serializable {
 
-    private static final long serialVersionUID = 1L;
     /* 国家 */
+    @NotBlank(message = "国家不能为空")
     private String country;
     /* 姓名 */
+    @NotBlank(message = "寄件人不能为空")
     private String name;
     /* 电话 */
+    @NotBlank(message = "寄件电话不能为空")
     private String phone;
     /* 省 */
+    @NotBlank(message = "寄件省份不能为空")
     private String province;
     /* 市 */
     private String city;
@@ -23,6 +27,7 @@ public class Sender implements Serializable {
     /* 城镇 */
     private String town;
     /* 地址 */
+//    @NotBlank(message = "寄件地址不能为空")
     private String address;
     /* 邮编 */
     private String postCode;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index b3788b670..b7e90a42c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -7,6 +7,7 @@ import com.xdadan.erp.emis.domain.EmisWaybillCargo;
 import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;