diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 60b80dd8d..c590d047c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -494,7 +494,7 @@ public class AsyncTask { Pattern p = null; Matcher m = null; boolean b = false; - p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号 + p = Pattern.compile("^[1][3,4,5,6,7,8,9][0-9]{9}$"); // 验证手机号 m = p.matcher(str); b = m.matches(); return b; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java index b9b2c9077..163134cd4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java @@ -62,6 +62,14 @@ public class TtMerchantPoi extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="地址",name="address") private String address; + private String addr; + public void setAddr(String addr) { + this.addr = this.address; + } + public String getAddr() { + return this.address; + } + @io.swagger.annotations.ApiModelProperty(value="抖音平台任务ID",name="taskId") private String taskId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index d93a99720..4e14b1d0b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -114,6 +114,13 @@ public class WxMerchantVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="ttPoi",name="ttPoi") @TableField(exist = false) private String ttPoi; + private String poiId; + public void setPoiId(String poiid) { + this.poiId = this.ttPoi; + } + public String getPoiId() { + return this.ttPoi; + } @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") @TableField(exist = false)