From 82ba4f144e6b9585aa0fb3132b9d11af957c17c9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 18 二月 2022 13:36:54 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
index 9db1d54..4709879 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
@@ -21,7 +21,7 @@
import lombok.Data;
/**
- * @title: AddConvenientMerchantDTO
+ * @title: ConvenientMerchantDTO
* @projectName: 成都呐喊信息技术有限公司-智慧社区项目
* @description: 新增/编辑便民服务商家
* @author: hans
@@ -52,7 +52,6 @@
private String idCard;
@ApiModelProperty("咨询电话")
- @Pattern(groups = {AddGroup.class}, message = "咨询电话格式错误", regexp = "(1[3|4|5|7|8][0-9]\\d{8})|(\\d{3}-\\d{8}|\\d{4}-\\d{7})")
private String phone;
@ApiModelProperty("商家地址")
@@ -94,14 +93,12 @@
private Integer businessStatus;
@ApiModelProperty("管理账号")
- @Pattern(groups = {AddGroup.class}, message = "请输入6-10位管理账号，由英文或数字组成", regexp = "^[0-9A-Za-z]{6,10}$")
+ @NotBlank(groups = {AddGroup.class}, message = "管理账号不能为空")
private String account;
@ApiModelProperty("登陆密码")
-// @Pattern(groups = {AddGroup.class}, message = "请输入8-12位登陆密码，由英文，数字和特殊符号组成",
-// regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Za-z\\d$@$!%*#?&]{8,12}$")
@Pattern(groups = {AddGroup.class}, message = "请输入8-12位登陆密码，由英文，数字和特殊符号组成",
- regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,}$")
+ regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$")
private String password;
@ApiModelProperty(value = "所属社区id")
@@ -114,6 +111,8 @@
@ApiModelProperty(value = "更新人", hidden = true)
private Long updatedBy;
+ private String areaCode;
+
public String getPeriod() {
return period.name();
}
@@ -121,4 +120,12 @@
public void setPeriod(MerchantBusinessPeriod period) {
this.period = period;
}
+
+ public Boolean getBusinessStatus() {
+ return businessStatus.intValue() == 1;
+ }
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? 1 : 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1