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