| @@ -494,7 +494,7 @@ public class AsyncTask { | |||||
| Pattern p = null; | Pattern p = null; | ||||
| Matcher m = null; | Matcher m = null; | ||||
| boolean b = false; | 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); | m = p.matcher(str); | ||||
| b = m.matches(); | b = m.matches(); | ||||
| return b; | return b; | ||||
| @@ -62,6 +62,14 @@ public class TtMerchantPoi extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="地址",name="address") | @io.swagger.annotations.ApiModelProperty(value="地址",name="address") | ||||
| private String 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") | @io.swagger.annotations.ApiModelProperty(value="抖音平台任务ID",name="taskId") | ||||
| private String taskId; | private String taskId; | ||||
| @@ -114,6 +114,13 @@ public class WxMerchantVo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="ttPoi",name="ttPoi") | @io.swagger.annotations.ApiModelProperty(value="ttPoi",name="ttPoi") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String ttPoi; | 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") | @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||