From 9fb0b7d623078e90747ac4a64283f29d4b4d51d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 15:11:08 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
index ad131b4..a5fa5e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -15,6 +16,7 @@
/**
* 收货地址ID
*/
+ @NotNull(message = "请选择正确的收获地址")
private Integer receiveAddrId;
/**
@@ -37,7 +39,11 @@
*/
private Integer joinActive;
-
+ /**
+ * 支付方式1微信，2 vipCard余额
+ */
+ @NotNull(message = "请选择支付方式")
+ private Integer payMethod;
/**
* 订单备注
--
Gitblit v1.9.1