From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 bce16a1..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
@@ -1,6 +1,7 @@
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;
@@ -37,17 +38,19 @@
@ApiModelProperty("店铺登陆账号")
+ //@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(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;
@@ -57,12 +60,22 @@
* 保存时添加sys_user所需
*/
@ApiModelProperty("sysUserId")
- @JsonIgnore
private Long sysUserId;
+
+ @ApiModelProperty(" 店铺状态（1.启用 2.禁用）")
+ private Integer status;
+
/**
* 当前登陆用户Id
*/
@JsonIgnore
private Long loginUserId;
+ @ApiModelProperty("id")
+ private Long id;
+
+ @ApiModelProperty("商家简介")
+ @Size(max = 25,min = 0,message = "简介长度不符合！")
+ private String storeDescribe;
+
}
--
Gitblit v1.7.1