From 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 14 十月 2021 11:07:12 +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 | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 28fd790..7b7b8e1 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
@@ -1,17 +1,17 @@
package com.panzhihua.common.model.vos.shop;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @auther llming
@@ -26,7 +26,7 @@
@ApiModelProperty("店铺名称")
@NotBlank(message = "店铺名称不能为空")
- @Size(max = 15,min = 1,message = "限制15字")
+ @Size(max = 15, min = 1, message = "限制15字")
private String name;
@ApiModelProperty("联系方式")
@@ -36,23 +36,19 @@
@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
private String phone;
-
@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;
-
@ApiModelProperty("店铺登陆密码")
@NotBlank(message = "店铺登陆密码不能为空")
- @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}$")
private String storePassword;
-
@ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
- @NotNull(message = "配送方式（1.商家配送 2.快递物流）")
+ @NotNull(message = "配送方式（1.商家配送 2.快递物流）不能为空")
private Integer deliveryType;
-
@ApiModelProperty("店铺logo")
private String logo;
@@ -74,4 +70,8 @@
@ApiModelProperty("id")
private Long id;
+ @ApiModelProperty("商家简介")
+ @Size(max = 25, min = 0, message = "简介长度不符合！")
+ private String storeDescribe;
+
}
--
Gitblit v1.7.1