Parcourir la source

[BUG][ID1001568][dev version:.1190.1685:日常费用账单-模版需要和需求页面字段保持一致]

release_toaliyun_real
gongbiao il y a 7 ans
Parent
révision
fd26b283af
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Voir le fichier

@@ -49,7 +49,7 @@ public class WxBillDaily extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private Long pay;

@Excel(name = "截止收款日期", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@Excel(name = "缴款截止日期", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@NotNull
@SortColumn(column = "receiveDate")
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java Voir le fichier

@@ -22,12 +22,12 @@ public class WxBillDailyVo extends WxBillDaily {
@io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber")
private String shopNumber;

@Excel(name = "实际应收金额", orderNum = "3", width = 20, numFormat = "#.##")
@Excel(name = "实际应收金额(元)", orderNum = "3", width = 20, numFormat = "#.##")
@NotNull
@io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePayStr")
private String receivePayStr;

@Excel(name = "实收金额", orderNum = "4", width = 20, numFormat = "#.##")
@Excel(name = "实收金额(元)", orderNum = "4", width = 20, numFormat = "#.##")
@NotNull
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr")
private String payStr;


Chargement…
Annuler
Enregistrer