Browse Source

fix bug

release_toaliyun_real
lin 2 years ago
parent
commit
2e8a54c745
3 changed files with 16 additions and 1 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java View File

@@ -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;


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java View File

@@ -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;


+ 7
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java View File

@@ -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)


Loading…
Cancel
Save