Browse Source

[code][修改]:与dev同步

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
29031ad1cf
3 changed files with 3 additions and 9 deletions
  1. +2
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
  2. +0
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java View File

@@ -14,14 +14,13 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class WxMsgValidationcodeModel extends BaseEntity {
private static final long serialVersionUID = 1L;
@Id
protected Long id;
@Transient
protected List<String> ids;
@Transient
protected String sortColumns;


@io.swagger.annotations.ApiModelProperty(value="名称",name="name")
private String name;


+ 0
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java View File

@@ -1516,9 +1516,4 @@ public class WxFlowServiceImpl implements WxFlowService {
public List<WxFlowModel> getModelBybusiness(WxFlowModel wxFlowModel) {
return wxFlowModelMapper.getModelBybusiness(wxFlowModel);
}

public static void main(String[] args) {
new Thread(() -> System.out.println(1 + "hello world")).start();

}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -402,7 +402,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
} catch (Exception e) {
e.printStackTrace();
logger.error("db failed: 商户创建失败, e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "商户创建失败");
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}

}


Loading…
Cancel
Save