java/zhihuishenqu.git

			@@ -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,12 +38,14 @@


			@ApiModelProperty("店铺登陆账号")
			@Pattern(groups = {AddGroup.class},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}$")
			private String storePassword;


			@@ -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 = 1,message = "简介长度不符合！")
			private String storeDescribe;

			}