diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java index a0c740e0..10e2107f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java @@ -61,6 +61,7 @@ public class PayMailContracrList { @ApiModelProperty(value = "邮寄联系人地址") private java.lang.String contactAddress; @Dict(dicCode ="contract_type") + @Excel(name = "合同类型", width = 15,dicCode = "contract_type") @ApiModelProperty(value = "合同类型") private java.lang.String contractType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java index dce6cfd8..97649312 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java @@ -25,8 +25,8 @@ public class PayWorkingGroupStatistics { @Excel(name = "实收总金额", width = 15) @ApiModelProperty(value = "实收总金额") private String comeAllMoney; - @Excel(name = "完收完成率", width = 15) - @ApiModelProperty(value = "完收完成率") + @Excel(name = "实收总金额", width = 15) + @ApiModelProperty(value = "实收总金额") private String moneyRate; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java index cd6bb8d9..2676d332 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java @@ -25,7 +25,7 @@ public class CompanyComeMoneyList { @Excel(name = "实收总金额", width = 15) @ApiModelProperty(value = "实收总金额") private String comeAllMoney; - @Excel(name = "实收完成率", width = 15) - @ApiModelProperty(value = "实收完成率") + @Excel(name = "到账率", width = 15) + @ApiModelProperty(value = "到账率") private String finishRate; }