Browse Source

Merge tag 'refs/tags/jenkins-back-end-2439' into release

develop
release_toaliyun_real
gongbiao 6 years ago
parent
commit
d644dc69d4
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java View File

@@ -49,7 +49,7 @@ public class WxCreditHistoryVo {
@io.swagger.annotations.ApiModelProperty(value = "小票URL", name = "receiptUrl") @io.swagger.annotations.ApiModelProperty(value = "小票URL", name = "receiptUrl")
private String receiptUrl; private String receiptUrl;


@Excel(name = "操作人", width = 20, orderNum = "11")
@Excel(name = "操作人", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value = "操作人", name = "operator") @io.swagger.annotations.ApiModelProperty(value = "操作人", name = "operator")
private String operator; private String operator;


@@ -68,6 +68,7 @@ public class WxCreditHistoryVo {
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId; private Long merchantId;


@Excel(name = "小票号", width = 20, orderNum = "11")
@io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber") @io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber")
private String ticketNumber; private String ticketNumber;




Loading…
Cancel
Save