Просмотр исходного кода

Merge commit 'refs/tags/jenkins-back-end-588^{}' into release

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
433e7f8d54
1 измененных файлов: 3 добавлений и 3 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java Просмотреть файл

@@ -29,7 +29,7 @@ public class WxMerchantMicroPayVo implements Serializable {
private String reportDate; private String reportDate;
/*商户电话**/ /*商户电话**/
@io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId")
private Long merchantPhone;
private String merchantPhone;
/*商户名**/ /*商户名**/
@io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName")
private String merchantName; private String merchantName;
@@ -58,11 +58,11 @@ public class WxMerchantMicroPayVo implements Serializable {
tradeAmt = _tradeAmt; tradeAmt = _tradeAmt;
} }


public Long getMerchantPhone() {
public String getMerchantPhone() {
return merchantPhone; return merchantPhone;
} }


public void setMerchantPhone(Long merchantPhone) {
public void setMerchantPhone(String merchantPhone) {
this.merchantPhone = merchantPhone; this.merchantPhone = merchantPhone;
} }




Загрузка…
Отмена
Сохранить