From b9ee8fe325fa9746b284d3487df96d93d84d6473 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 18:05:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
index 6af89c0..f7b68cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -38,7 +38,7 @@
@ApiModelProperty("店铺登陆账号")
- //@Pattern(groups = {AddGroup.class}, message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+ //@Pattern(message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
@NotBlank(message = "店铺登陆账号不能为空")
private String storeAccount;
@@ -50,7 +50,7 @@
@ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
- @NotNull(message = "配送方式（1.商家配送 2.快递物流）")
+ @NotNull(message = "配送方式（1.商家配送 2.快递物流）不能为空")
private Integer deliveryType;
@@ -75,7 +75,7 @@
private Long id;
@ApiModelProperty("商家简介")
- @Size(max = 25,min = 1,message = "简介长度不符合！")
+ @Size(max = 25,min = 0,message = "简介长度不符合！")
private String storeDescribe;
}
--
Gitblit v1.7.1